@notionhq/custom-blocks-host 0.2.0 → 0.2.2

package/README.md

@@ -155,6 +155,12 @@ TypeScript infers request types for handlers passed to `createCustomBlockHost()`
 defined handlers and helpers, import the corresponding request and page-property types directly from
 `@notionhq/custom-blocks-host`.
 
+Adapters can pass plain string IDs in initial state, live-state setters, and handler results such as
+`CustomBlockHostGetPageResult`. The host validates these values before using or sending them.
+Parsing assigns protocol ID brands for internal type checking and applies schema defaults, such as
+an empty manifest data source `properties` map. Brands distinguish ID kinds in TypeScript. They do
+not check record existence or access.
+
 Request types such as `GetPageMessage` describe validated messages that handlers receive. The
 corresponding `*MessageInput` types accept plain string IDs for adapters and test fixtures that
 construct requests. These types do not validate values at runtime. The host runtime validates
@@ -182,7 +188,7 @@ Derive bindings from the successful `connect` message inside `getInitialState` a
 
 Set `sandboxOrigin` to the iframe's exact origin. The runtime targets outbound messages to that
 origin and accepts inbound messages only from that iframe and origin. The runtime accepts
-`noConnectTimeoutMs`, `initialStateTimeoutMs`, and `noInitResultTimeoutMs`; all default to five
+`noConnectTimeoutMs`, `initialStateTimeoutMs`, and `noInitResultTimeoutMs`. All default to five
 seconds.
 
 ### Initialization and malformed messages

package/dist/createCustomBlockHost.d.ts

@@ -1,10 +1,11 @@
-import type { NotionContrastMode } from "./protocol/contrast.js";
-import type { NotionDataSourceId } from "./protocol/ids.js";
+import type { notionContrastModeSchema } from "./protocol/contrast.js";
+import { notionDataSourceIdSchema } from "./protocol/ids.js";
 import type { CustomBlockManifest } from "./protocol/manifest.js";
-import type { CustomBlockPage } from "./protocol/pages/page.js";
-import type { NotionParent } from "./protocol/parent.js";
-import type { NotionTheme } from "./protocol/theme.js";
-import type { NotionUser } from "./protocol/users/user.js";
+import type { customBlockPageSchema } from "./protocol/pages/page.js";
+import type { notionParentSchema } from "./protocol/parent.js";
+import type { notionThemeSchema } from "./protocol/theme.js";
+import type { notionUserSchema } from "./protocol/users/user.js";
+import type { InferInput } from "valibot";
 import type { CustomBlockHostDataSourcesPayload, CustomBlockHostGetInitialState } from "./lifecycle/types.js";
 import type { CustomBlockHostFailure, CustomBlockHostHandlers, CustomBlockHostLogDirection } from "./messages/types.js";
 export type CustomBlockHostOptions = {
@@ -39,14 +40,14 @@ export type CustomBlockHostOptions = {
 };
 export type CustomBlockHostHandle = {
     stop: () => void;
-    setTheme: (theme: NotionTheme) => void;
-    setContrastMode: (contrastMode: NotionContrastMode) => void;
-    setParent: (parent: NotionParent) => void;
-    setPage: (page: CustomBlockPage) => void;
+    setTheme: (theme: InferInput<typeof notionThemeSchema>) => void;
+    setContrastMode: (contrastMode: InferInput<typeof notionContrastModeSchema>) => void;
+    setParent: (parent: InferInput<typeof notionParentSchema>) => void;
+    setPage: (page: InferInput<typeof customBlockPageSchema>) => void;
     setDataSources: (dataSources: CustomBlockHostDataSourcesPayload) => void;
-    setCurrentUser: (currentUser: NotionUser) => void;
+    setCurrentUser: (currentUser: InferInput<typeof notionUserSchema>) => void;
     refreshQuery: (args: {
-        dataSourceId: NotionDataSourceId;
+        dataSourceId: InferInput<typeof notionDataSourceIdSchema>;
     }) => void;
 };
 export declare function createCustomBlockHost(options: CustomBlockHostOptions): CustomBlockHostHandle;

package/dist/createCustomBlockHost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCustomBlockHost.d.ts","sourceRoot":"","sources":["../src/createCustomBlockHost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAA;AAEtF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AACjF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AAcvF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAA;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAA;AAIhF,OAAO,KAAK,EACX,iCAAiC,EACjC,8BAA8B,EAG9B,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EACX,sBAAsB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,MAAM,qBAAqB,CAAA;AAe5B,MAAM,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,iBAAiB,CAAA;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,EAAE,uBAAuB,CAAA;IACjC,oHAAoH;IACpH,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACpD,gGAAgG;IAChG,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,QAAQ,EAAE,mBAAmB,CAAA;QAC7B,aAAa,CAAC,EAAE,MAAM,CAAA;KACtB,KAAK,IAAI,CAAA;IACV;;;;;OAKG;IACH,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAA;IACnD,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC1E,eAAe,EAAE,8BAA8B,CAAA;IAC/C,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAA;IACtC,eAAe,EAAE,CAAC,YAAY,EAAE,kBAAkB,KAAK,IAAI,CAAA;IAC3D,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAA;IACzC,OAAO,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAA;IACxC,cAAc,EAAE,CAAC,WAAW,EAAE,iCAAiC,KAAK,IAAI,CAAA;IACxE,cAAc,EAAE,CAAC,WAAW,EAAE,UAAU,KAAK,IAAI,CAAA;IACjD,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,YAAY,EAAE,kBAAkB,CAAA;KAAE,KAAK,IAAI,CAAA;CAClE,CAAA;AAyBD,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,sBAAsB,GAC7B,qBAAqB,CA8WvB"}
+{"version":3,"file":"createCustomBlockHost.d.ts","sourceRoot":"","sources":["../src/createCustomBlockHost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AAI5F,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAA;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AAiBvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAA;AAC3F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAA;AAEpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAA;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAA;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAKzC,OAAO,KAAK,EACX,iCAAiC,EACjC,8BAA8B,EAI9B,MAAM,sBAAsB,CAAA;AAG7B,OAAO,KAAK,EACX,sBAAsB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,MAAM,qBAAqB,CAAA;AAe5B,MAAM,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,iBAAiB,CAAA;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,EAAE,uBAAuB,CAAA;IACjC,oHAAoH;IACpH,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACpD,gGAAgG;IAChG,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,QAAQ,EAAE,mBAAmB,CAAA;QAC7B,aAAa,CAAC,EAAE,MAAM,CAAA;KACtB,KAAK,IAAI,CAAA;IACV;;;;;OAKG;IACH,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAA;IACnD,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC1E,eAAe,EAAE,8BAA8B,CAAA;IAC/C,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,QAAQ,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,IAAI,CAAA;IAC/D,eAAe,EAAE,CAChB,YAAY,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,KACrD,IAAI,CAAA;IACT,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,KAAK,IAAI,CAAA;IAClE,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,KAAK,IAAI,CAAA;IACjE,cAAc,EAAE,CAAC,WAAW,EAAE,iCAAiC,KAAK,IAAI,CAAA;IACxE,cAAc,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,KAAK,IAAI,CAAA;IAC1E,YAAY,EAAE,CAAC,IAAI,EAAE;QACpB,YAAY,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAA;KACzD,KAAK,IAAI,CAAA;CACV,CAAA;AAQD,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,sBAAsB,GAC7B,qBAAqB,CAgYvB"}

package/dist/createCustomBlockHost.js

@@ -1,7 +1,14 @@
+import { notionDataSourceBindingsSchema } from "./protocol/dataSources/dataSource.js";
+import { notionDataSourceIdSchema } from "./protocol/ids.js";
+import { manifestSchema } from "./protocol/manifest.js";
+import { hostToSandboxMessageSchema, } from "./protocol/messages/hostToSandbox.js";
+import { initMessageSchema, } from "./protocol/messages/init.js";
 import { LATEST_BRIDGE_PROTOCOL_VERSION } from "./protocol/protocolVersion.js";
+import * as v from "valibot";
 import { initErrorForFailureReason } from "./lifecycle/initErrors.js";
 import { createInitializationController } from "./lifecycle/initializationController.js";
 import { normalizeHostToSandboxMessage } from "./lifecycle/normalizeHostToSandboxMessage.js";
+import { customBlockHostInitialStateSchema } from "./lifecycle/types.js";
 import { createSandboxMessageRouter } from "./messages/sandboxMessageRouter.js";
 import { MIN_HOST_SUPPORTED_BRIDGE_PROTOCOL_VERSION } from "./protocolVersion.js";
 import { QuerySubscriptions, } from "./queries/querySubscriptions.js";
@@ -47,7 +54,7 @@ export function createCustomBlockHost(options) {
         iframe.contentWindow?.postMessage(sandboxMessage, sandboxOrigin);
     }
     function sendInitMessage(message) {
-        postToSandbox(message);
+        postToSandbox(v.parse(initMessageSchema, message));
     }
     function sendNack(message) {
         postToSandbox(message);
@@ -56,7 +63,7 @@ export function createCustomBlockHost(options) {
         const status = initializationController.status;
         switch (status) {
             case "initialized":
-                postToSandbox(message);
+                postToSandbox(v.parse(hostToSandboxMessageSchema, message));
                 return;
             // Send state updates and handler results only after initialization succeeds.
             case "waitingForConnect":
@@ -78,12 +85,11 @@ export function createCustomBlockHost(options) {
             return;
         }
         const response = await handler(message);
-        const result = {
+        sendInitializedMessage({
             type: `${message.type}Result`,
             requestId: message.requestId,
             ...response,
-        };
-        sendInitializedMessage(result);
+        });
     }
     function postQueryDataSourceResult(args) {
         const message = args.response.status === "error"
@@ -195,10 +201,17 @@ export function createCustomBlockHost(options) {
         if (result.status === "error") {
             return result;
         }
-        manifest = result.initialState.manifest;
+        manifest = v.parse(manifestSchema, result.initialState.manifest);
         onManifest?.(manifest);
-        const initialState = { ...result.initialState, ...pendingState };
+        const initialStateInput = {
+            ...result.initialState,
+            ...pendingState,
+        };
         pendingState = {};
+        const initialState = {
+            ...v.parse(v.omit(customBlockHostInitialStateSchema, ["manifest"]), initialStateInput),
+            manifest,
+        };
         if (sandboxBridgeProtocolVersion <
             BRIDGE_PROTOCOL_VERSION_INTRODUCING_UNAVAILABLE_PAGE &&
             initialState.page.type === "unavailable") {
@@ -279,23 +292,27 @@ export function createCustomBlockHost(options) {
             updateHostState({ currentUser });
         },
         setDataSources(dataSources) {
+            const normalizedDataSources = {
+                bindings: v.parse(notionDataSourceBindingsSchema, dataSources.bindings),
+            };
             if (initializationController.hasConnectedSandbox &&
                 manifest !== undefined &&
-                getBindingErrorCode(manifest, dataSources) !== undefined) {
+                getBindingErrorCode(manifest, normalizedDataSources) !== undefined) {
                 emit("warn", {
                     message: "Ignored invalid data source bindings update",
-                    payload: dataSources,
+                    payload: normalizedDataSources,
                 });
                 return;
             }
-            activeDataSources = dataSources;
-            updateHostState({ dataSources });
+            activeDataSources = normalizedDataSources;
+            updateHostState({ dataSources: normalizedDataSources });
         },
         refreshQuery({ dataSourceId }) {
             if (initializationController.status !== "initialized") {
                 return;
             }
-            const refreshes = querySubscriptions.refresh(dataSourceId);
+            const normalizedDataSourceId = v.parse(notionDataSourceIdSchema, dataSourceId);
+            const refreshes = querySubscriptions.refresh(normalizedDataSourceId);
             if (refreshes.length === 0) {
                 emit("warn", `No active query exists for data source "${dataSourceId}"`);
                 return;

package/dist/index.d.ts

@@ -1,12 +1,13 @@
+export type { CustomBlockErrorInfo } from "./protocol/errors.js";
 export type { CreatePageMessage } from "./protocol/messages/createPage.js";
 export type { GetPageMessage } from "./protocol/messages/getPage.js";
 export type { GetUserMessage } from "./protocol/messages/getUser.js";
 export type { ListUsersMessage } from "./protocol/messages/listUsers.js";
 export type { OpenPageMessage } from "./protocol/messages/openPage.js";
-export type { QueryDataSourceMessage } from "./protocol/messages/queryDataSource.js";
+export type { CustomBlockCheckboxFilterOperator, CustomBlockContainsFilterOperator, CustomBlockCreatedByFilterOperator, CustomBlockDateFilterOperator, CustomBlockNumberFilterOperator, CustomBlockOptionFilterOperator, CustomBlockPeopleFilterOperator, CustomBlockPersonFilterValue, CustomBlockTextFilterOperator, QueryDataSourceMessage, ResolvedCustomBlockDataSourceFilter, ResolvedCustomBlockDataSourcePropertyFilter, ResolvedCustomBlockDataSourceSort, } from "./protocol/messages/queryDataSource.js";
 export type { ResizeMessage } from "./protocol/messages/resize.js";
 export type { UpdatePageMessage } from "./protocol/messages/updatePage.js";
-export type { NotionPagePropertyValue, NotionPagePropertyWriteMap, NotionRichTextItem, } from "./protocol/pages/page.js";
+export type { NotionDateInput, NotionFileInput, NotionPageCover, NotionPageIcon, NotionPagePropertyValue, NotionPagePropertyWriteMap, NotionRichTextItem, NotionSelectOptionInput, } from "./protocol/pages/page.js";
 export { type AutoBindableProperty, getAutoBoundPropertyIdsByKey, } from "./autoBindProperties.js";
 export { type CustomBlockHostHandle, type CustomBlockHostOptions, createCustomBlockHost, } from "./createCustomBlockHost.js";
 export type { ConnectSuccessMessage, CustomBlockHostDataSourcesPayload, CustomBlockHostGetInitialState, CustomBlockHostInitialState, CustomBlockHostInitialStateResult, } from "./lifecycle/types.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,YAAY,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,YAAY,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,YAAY,EAAE,gBAAgB,EAAE,MAAM,wDAAwD,CAAA;AAC9F,YAAY,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAA;AAC5F,YAAY,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AAC1G,YAAY,EAAE,aAAa,EAAE,MAAM,qDAAqD,CAAA;AACxF,YAAY,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,YAAY,EACX,uBAAuB,EACvB,0BAA0B,EAC1B,kBAAkB,GAClB,MAAM,gDAAgD,CAAA;AACvD,OAAO,EACN,KAAK,oBAAoB,EACzB,4BAA4B,GAC5B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACN,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,qBAAqB,GACrB,MAAM,4BAA4B,CAAA;AACnC,YAAY,EACX,qBAAqB,EACrB,iCAAiC,EACjC,8BAA8B,EAC9B,2BAA2B,EAC3B,iCAAiC,GACjC,MAAM,sBAAsB,CAAA;AAC7B,YAAY,EACX,sBAAsB,EACtB,+BAA+B,EAC/B,sBAAsB,EACtB,4BAA4B,EAC5B,4BAA4B,EAC5B,uBAAuB,EACvB,8BAA8B,EAC9B,2BAA2B,EAC3B,6BAA6B,EAC7B,+BAA+B,EAC/B,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,2BAA2B,EAC3B,kBAAkB,EAClB,sBAAsB,GACtB,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAA;AACtF,YAAY,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,YAAY,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,YAAY,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,YAAY,EAAE,gBAAgB,EAAE,MAAM,wDAAwD,CAAA;AAC9F,YAAY,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAA;AAC5F,YAAY,EACX,iCAAiC,EACjC,iCAAiC,EACjC,kCAAkC,EAClC,6BAA6B,EAC7B,+BAA+B,EAC/B,+BAA+B,EAC/B,+BAA+B,EAC/B,4BAA4B,EAC5B,6BAA6B,EAC7B,sBAAsB,EACtB,mCAAmC,EACnC,2CAA2C,EAC3C,iCAAiC,GACjC,MAAM,8DAA8D,CAAA;AACrE,YAAY,EAAE,aAAa,EAAE,MAAM,qDAAqD,CAAA;AACxF,YAAY,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,YAAY,EACX,eAAe,EACf,eAAe,EACf,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,0BAA0B,EAC1B,kBAAkB,EAClB,uBAAuB,GACvB,MAAM,gDAAgD,CAAA;AACvD,OAAO,EACN,KAAK,oBAAoB,EACzB,4BAA4B,GAC5B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACN,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,qBAAqB,GACrB,MAAM,4BAA4B,CAAA;AACnC,YAAY,EACX,qBAAqB,EACrB,iCAAiC,EACjC,8BAA8B,EAC9B,2BAA2B,EAC3B,iCAAiC,GACjC,MAAM,sBAAsB,CAAA;AAC7B,YAAY,EACX,sBAAsB,EACtB,+BAA+B,EAC/B,sBAAsB,EACtB,4BAA4B,EAC5B,4BAA4B,EAC5B,uBAAuB,EACvB,8BAA8B,EAC9B,2BAA2B,EAC3B,6BAA6B,EAC7B,+BAA+B,EAC/B,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,2BAA2B,EAC3B,kBAAkB,EAClB,sBAAsB,GACtB,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAA"}

package/dist/lifecycle/initializationController.d.ts

@@ -1,11 +1,12 @@
 import type { ConnectMessage } from "../protocol/messages/connect.js";
-import type { CustomBlockInitErrorInfo, InitMessage } from "../protocol/messages/init.js";
+import type { CustomBlockInitErrorInfo, initMessageSchema } from "../protocol/messages/init.js";
 import type { InitResultMessage } from "../protocol/messages/initResult.js";
+import type { InferInput } from "valibot";
 import type { CustomBlockHostFailure } from "../messages/types.js";
 import type { ConnectSuccessMessage, CustomBlockHostInitialStateResult, InitStatus } from "./types.js";
 export type InitializationControllerOptions = {
     prepareInit: (connect: ConnectSuccessMessage) => Promise<CustomBlockHostInitialStateResult>;
-    sendInitMessage: (message: InitMessage) => void;
+    sendInitMessage: (message: InferInput<typeof initMessageSchema>) => void;
     warn: (payload: unknown) => void;
     flushPendingHostStateChanges: () => void;
     minBridgeProtocolVersion: number;

package/dist/lifecycle/initializationController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initializationController.d.ts","sourceRoot":"","sources":["../../src/lifecycle/initializationController.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,OAAO,KAAK,EACX,wBAAwB,EACxB,WAAW,EACX,MAAM,mDAAmD,CAAA;AAC1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAIlE,OAAO,KAAK,EACX,qBAAqB,EACrB,iCAAiC,EACjC,UAAU,EACV,MAAM,YAAY,CAAA;AAMnB,MAAM,MAAM,+BAA+B,GAAG;IAC7C,WAAW,EAAE,CACZ,OAAO,EAAE,qBAAqB,KAC1B,OAAO,CAAC,iCAAiC,CAAC,CAAA;IAC/C,eAAe,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;IAC/C,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAChC,4BAA4B,EAAE,MAAM,IAAI,CAAA;IACxC,wBAAwB,EAAE,MAAM,CAAA;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,mBAAmB,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAA;IAC5D,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACnD,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAA;CACnD,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAA;IAC3B,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAA;IACrC,aAAa,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAA;IAChD,gBAAgB,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACtD,oBAAoB,EAAE,CAAC,IAAI,EAAE;QAC5B,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;QACpC,KAAK,EAAE,wBAAwB,CAAA;QAC/B,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAA;KACzC,KAAK,SAAS,GAAG,MAAM,CAAA;IACxB,uBAAuB,EAAE,CAAC,IAAI,EAAE;QAC/B,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;QACpC,KAAK,EAAE,wBAAwB,CAAA;KAC/B,KAAK,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,IAAI,CAAA;IACxB,IAAI,EAAE,MAAM,IAAI,CAAA;CAChB,CAAA;AAED,wBAAgB,8BAA8B,CAC7C,OAAO,EAAE,+BAA+B,GACtC,wBAAwB,CAiU1B"}
+{"version":3,"file":"initializationController.d.ts","sourceRoot":"","sources":["../../src/lifecycle/initializationController.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,OAAO,KAAK,EACX,wBAAwB,EACxB,iBAAiB,EACjB,MAAM,mDAAmD,CAAA;AAC1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAIlE,OAAO,KAAK,EACX,qBAAqB,EACrB,iCAAiC,EACjC,UAAU,EACV,MAAM,YAAY,CAAA;AAMnB,MAAM,MAAM,+BAA+B,GAAG;IAC7C,WAAW,EAAE,CACZ,OAAO,EAAE,qBAAqB,KAC1B,OAAO,CAAC,iCAAiC,CAAC,CAAA;IAC/C,eAAe,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,IAAI,CAAA;IACxE,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAChC,4BAA4B,EAAE,MAAM,IAAI,CAAA;IACxC,wBAAwB,EAAE,MAAM,CAAA;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,mBAAmB,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAA;IAC5D,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACnD,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAA;CACnD,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACtC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAA;IAC3B,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAA;IACrC,aAAa,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAA;IAChD,gBAAgB,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACtD,oBAAoB,EAAE,CAAC,IAAI,EAAE;QAC5B,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;QACpC,KAAK,EAAE,wBAAwB,CAAA;QAC/B,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAA;KACzC,KAAK,SAAS,GAAG,MAAM,CAAA;IACxB,uBAAuB,EAAE,CAAC,IAAI,EAAE;QAC/B,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;QACpC,KAAK,EAAE,wBAAwB,CAAA;KAC/B,KAAK,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,IAAI,CAAA;IACxB,IAAI,EAAE,MAAM,IAAI,CAAA;CAChB,CAAA;AAED,wBAAgB,8BAA8B,CAC7C,OAAO,EAAE,+BAA+B,GACtC,wBAAwB,CAiU1B"}

package/dist/lifecycle/types.d.ts

@@ -1,13 +1,7 @@
-import type { NotionContrastMode } from "../protocol/contrast.js";
-import type { NotionDataSourceBindings } from "../protocol/dataSources/dataSource.js";
-import type { NotionBlockId } from "../protocol/ids.js";
-import type { CustomBlockManifest } from "../protocol/manifest.js";
+import { notionDataSourceBindingsSchema } from "../protocol/dataSources/dataSource.js";
 import type { ConnectMessage } from "../protocol/messages/connect.js";
 import type { CustomBlockInitErrorInfo } from "../protocol/messages/init.js";
-import type { CustomBlockPage } from "../protocol/pages/page.js";
-import type { NotionParent } from "../protocol/parent.js";
-import type { NotionTheme } from "../protocol/theme.js";
-import type { NotionUser } from "../protocol/users/user.js";
+import * as v from "valibot";
 export type ConnectSuccessMessage = Extract<ConnectMessage, {
     status: "success";
 }>;
@@ -26,22 +20,239 @@ export type InitStatus =
 /** The host is stopped and no longer sends or accepts sandbox messages. */
  | "stopped";
 export type CustomBlockHostDataSourcesPayload = {
-    bindings: NotionDataSourceBindings;
+    bindings: v.InferInput<typeof notionDataSourceBindingsSchema>;
 };
-export type CustomBlockHostInitialState = {
-    theme: NotionTheme;
+export type CustomBlockHostNormalizedDataSourcesPayload = {
+    bindings: v.InferOutput<typeof notionDataSourceBindingsSchema>;
+};
+export declare const customBlockHostInitialStateSchema: v.ObjectSchema<{
+    readonly theme: v.PicklistSchema<["light", "dark"], undefined>;
     /**
      * Defaults to standard for existing host integrations.
      * TODO(custom-blocks): Make this required when MIN_HOST_SUPPORTED_BRIDGE_PROTOCOL_VERSION increases to 4.
      */
-    contrastMode?: NotionContrastMode;
-    blockId: NotionBlockId;
-    parent: NotionParent;
-    page: CustomBlockPage;
-    manifest: CustomBlockManifest;
-    dataSources: CustomBlockHostDataSourcesPayload;
-    currentUser: NotionUser;
-};
+    readonly contrastMode: v.OptionalSchema<v.PicklistSchema<["standard", "high"], undefined>, undefined>;
+    readonly blockId: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionBlockId">]>;
+    readonly parent: v.VariantSchema<"type", [v.ObjectSchema<{
+        readonly type: v.LiteralSchema<"page_id", undefined>;
+        readonly page_id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionPageId">]>;
+    }, undefined>, v.ObjectSchema<{
+        readonly type: v.LiteralSchema<"data_source_id", undefined>;
+        readonly data_source_id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionDataSourceId">]>;
+    }, undefined>, v.ObjectSchema<{
+        readonly type: v.LiteralSchema<"workspace", undefined>;
+        readonly workspace: v.LiteralSchema<true, undefined>;
+    }, undefined>, v.ObjectSchema<{
+        readonly type: v.LiteralSchema<"block_id", undefined>;
+        readonly block_id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionBlockId">]>;
+    }, undefined>, v.ObjectSchema<{
+        readonly type: v.LiteralSchema<"agent_id", undefined>;
+        readonly agent_id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionAgentId">]>;
+    }, undefined>, v.ObjectSchema<{
+        readonly type: v.LiteralSchema<"unavailable", undefined>;
+    }, undefined>], undefined>;
+    readonly page: v.VariantSchema<"type", [v.ObjectSchema<{
+        readonly type: v.LiteralSchema<"unavailable", undefined>;
+    }, undefined>, v.ObjectSchema<{
+        readonly type: v.LiteralSchema<"page", undefined>;
+        readonly id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionPageId">]>;
+        readonly parent: v.VariantSchema<"type", [v.ObjectSchema<{
+            readonly type: v.LiteralSchema<"page_id", undefined>;
+            readonly page_id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionPageId">]>;
+        }, undefined>, v.ObjectSchema<{
+            readonly type: v.LiteralSchema<"data_source_id", undefined>;
+            readonly data_source_id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionDataSourceId">]>;
+        }, undefined>, v.ObjectSchema<{
+            readonly type: v.LiteralSchema<"workspace", undefined>;
+            readonly workspace: v.LiteralSchema<true, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly type: v.LiteralSchema<"block_id", undefined>;
+            readonly block_id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionBlockId">]>;
+        }, undefined>, v.ObjectSchema<{
+            readonly type: v.LiteralSchema<"agent_id", undefined>;
+            readonly agent_id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionAgentId">]>;
+        }, undefined>, v.ObjectSchema<{
+            readonly type: v.LiteralSchema<"unavailable", undefined>;
+        }, undefined>], undefined>;
+    }, undefined>], undefined>;
+    readonly manifest: v.ObjectSchema<{
+        readonly version: v.LiteralSchema<1, undefined>;
+        readonly dataSources: v.RecordSchema<v.StringSchema<undefined>, v.ObjectSchema<{
+            readonly name: v.StringSchema<undefined>;
+            readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+            readonly icon: v.OptionalSchema<v.VariantSchema<"type", [v.ObjectSchema<{
+                readonly type: v.LiteralSchema<"emoji", undefined>;
+                readonly emoji: v.StringSchema<undefined>;
+            }, undefined>, v.ObjectSchema<{
+                readonly type: v.LiteralSchema<"external", undefined>;
+                readonly url: v.StringSchema<undefined>;
+            }, undefined>], undefined>, undefined>;
+            readonly properties: v.OptionalSchema<v.RecordSchema<v.StringSchema<undefined>, v.ObjectSchema<{
+                readonly name: v.StringSchema<undefined>;
+                readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly type: v.PicklistSchema<readonly ["title", "rich_text", "number", "checkbox", "url", "email", "phone_number", "select", "multi_select", "status", "date", "people", "files", "unique_id", "relation", "place", "formula", "rollup", "button", "verification", "last_visited_time", "location", "created_time", "last_edited_time", "created_by", "last_edited_by"], undefined>;
+            }, undefined>, undefined>, {}>;
+        }, undefined>, undefined>;
+    }, undefined>;
+    readonly dataSources: v.ObjectSchema<{
+        readonly bindings: v.RecordSchema<v.StringSchema<undefined>, v.ObjectSchema<{
+            readonly collectionPointer: v.OptionalSchema<v.ObjectSchema<{
+                readonly id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionDataSourceId">]>;
+                readonly table: v.StringSchema<undefined>;
+                readonly spaceId: v.OptionalSchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionSpaceId">]>, undefined>;
+            }, undefined>, undefined>;
+            readonly collectionSchema: v.OptionalSchema<v.ObjectSchema<{
+                readonly id: v.OptionalSchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionDataSourceId">]>, undefined>;
+                readonly propertiesById: v.RecordSchema<v.StringSchema<undefined>, v.VariantSchema<"type", [v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"title", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"rich_text", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"number", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"checkbox", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"url", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"email", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"phone_number", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"select", undefined>;
+                    readonly options: v.ArraySchema<v.ObjectSchema<{
+                        readonly id: v.StringSchema<undefined>;
+                        readonly name: v.StringSchema<undefined>;
+                        readonly color: v.OptionalSchema<v.PicklistSchema<["default", "gray", "brown", "orange", "yellow", "green", "blue", "purple", "pink", "red", "gray_background", "brown_background", "orange_background", "yellow_background", "green_background", "blue_background", "purple_background", "pink_background", "red_background", "default_background"], undefined>, undefined>;
+                        readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    }, undefined>, undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"multi_select", undefined>;
+                    readonly options: v.ArraySchema<v.ObjectSchema<{
+                        readonly id: v.StringSchema<undefined>;
+                        readonly name: v.StringSchema<undefined>;
+                        readonly color: v.OptionalSchema<v.PicklistSchema<["default", "gray", "brown", "orange", "yellow", "green", "blue", "purple", "pink", "red", "gray_background", "brown_background", "orange_background", "yellow_background", "green_background", "blue_background", "purple_background", "pink_background", "red_background", "default_background"], undefined>, undefined>;
+                        readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    }, undefined>, undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"status", undefined>;
+                    readonly options: v.ArraySchema<v.ObjectSchema<{
+                        readonly id: v.StringSchema<undefined>;
+                        readonly name: v.StringSchema<undefined>;
+                        readonly color: v.OptionalSchema<v.PicklistSchema<["default", "gray", "brown", "orange", "yellow", "green", "blue", "purple", "pink", "red", "gray_background", "brown_background", "orange_background", "yellow_background", "green_background", "blue_background", "purple_background", "pink_background", "red_background", "default_background"], undefined>, undefined>;
+                        readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    }, undefined>, undefined>;
+                    readonly groups: v.ArraySchema<v.ObjectSchema<{
+                        readonly id: v.StringSchema<undefined>;
+                        readonly name: v.StringSchema<undefined>;
+                        readonly color: v.OptionalSchema<v.PicklistSchema<["default", "gray", "brown", "orange", "yellow", "green", "blue", "purple", "pink", "red", "gray_background", "brown_background", "orange_background", "yellow_background", "green_background", "blue_background", "purple_background", "pink_background", "red_background", "default_background"], undefined>, undefined>;
+                        readonly option_ids: v.ArraySchema<v.StringSchema<undefined>, undefined>;
+                    }, undefined>, undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"date", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"people", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"files", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"unique_id", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"relation", undefined>;
+                    readonly data_source_id: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly dual_property: v.OptionalSchema<v.ObjectSchema<{
+                        readonly synced_property_id: v.StringSchema<undefined>;
+                        readonly synced_property_name: v.StringSchema<undefined>;
+                    }, undefined>, undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"place", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"formula", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"rollup", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"button", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"verification", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"last_visited_time", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"location", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"created_time", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"last_edited_time", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"created_by", undefined>;
+                }, undefined>, v.ObjectSchema<{
+                    readonly name: v.StringSchema<undefined>;
+                    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                    readonly type: v.LiteralSchema<"last_edited_by", undefined>;
+                }, undefined>], undefined>, undefined>;
+            }, undefined>, undefined>;
+            readonly propertyIdsByKey: v.OptionalSchema<v.RecordSchema<v.StringSchema<undefined>, v.OptionalSchema<v.StringSchema<undefined>, undefined>, undefined>, undefined>;
+        }, undefined>, undefined>;
+    }, undefined>;
+    readonly currentUser: v.ObjectSchema<{
+        readonly object: v.LiteralSchema<"user", undefined>;
+        readonly id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionUserId">]>;
+        readonly name: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+        readonly avatar_url: v.NullableSchema<v.StringSchema<undefined>, undefined>;
+        readonly type: v.LiteralSchema<"person", undefined>;
+        readonly person: v.ObjectSchema<{
+            readonly email: v.StringSchema<undefined>;
+        }, undefined>;
+    }, undefined>;
+}, undefined>;
+export type CustomBlockHostInitialState = v.InferInput<typeof customBlockHostInitialStateSchema>;
 export type CustomBlockHostInitialStateResult = {
     status: "success";
     initialState: CustomBlockHostInitialState;

package/dist/lifecycle/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lifecycle/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4DAA4D,CAAA;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAA;AACjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAA;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAA;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAA;AAEhF,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAC1C,cAAc,EACd;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,CACrB,CAAA;AAED,gEAAgE;AAChE,MAAM,MAAM,UAAU;AACrB,qEAAqE;AACnE,mBAAmB;AACrB,mEAAmE;GACjE,eAAe;AACjB,6EAA6E;GAC3E,sBAAsB;AACxB,yDAAyD;GACvD,aAAa;AACf,gFAAgF;GAC9E,OAAO;AACT,2EAA2E;GACzE,SAAS,CAAA;AAEZ,MAAM,MAAM,iCAAiC,GAAG;IAC/C,QAAQ,EAAE,wBAAwB,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,2BAA2B,GAAG;IACzC,KAAK,EAAE,WAAW,CAAA;IAClB;;;OAGG;IACH,YAAY,CAAC,EAAE,kBAAkB,CAAA;IACjC,OAAO,EAAE,aAAa,CAAA;IACtB,MAAM,EAAE,YAAY,CAAA;IACpB,IAAI,EAAE,eAAe,CAAA;IACrB,QAAQ,EAAE,mBAAmB,CAAA;IAC7B,WAAW,EAAE,iCAAiC,CAAA;IAC9C,WAAW,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,iCAAiC,GAC1C;IACA,MAAM,EAAE,SAAS,CAAA;IACjB,YAAY,EAAE,2BAA2B,CAAA;CACxC,GACD;IACA,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,wBAAwB,CAAA;CAC9B,CAAA;AAEJ,MAAM,MAAM,8BAA8B,GAAG,CAC5C,OAAO,EAAE,qBAAqB,KAC1B,OAAO,CAAC,iCAAiC,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lifecycle/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,MAAM,4DAA4D,CAAA;AAG3G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAA;AAKjG,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAE5B,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAC1C,cAAc,EACd;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,CACrB,CAAA;AAED,gEAAgE;AAChE,MAAM,MAAM,UAAU;AACrB,qEAAqE;AACnE,mBAAmB;AACrB,mEAAmE;GACjE,eAAe;AACjB,6EAA6E;GAC3E,sBAAsB;AACxB,yDAAyD;GACvD,aAAa;AACf,gFAAgF;GAC9E,OAAO;AACT,2EAA2E;GACzE,SAAS,CAAA;AAEZ,MAAM,MAAM,iCAAiC,GAAG;IAC/C,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC,OAAO,8BAA8B,CAAC,CAAA;CAC7D,CAAA;AAED,MAAM,MAAM,2CAA2C,GAAG;IACzD,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC,OAAO,8BAA8B,CAAC,CAAA;CAC9D,CAAA;AAED,eAAO,MAAM,iCAAiC;;IAE7C;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAQF,CAAA;AAEF,MAAM,MAAM,2BAA2B,GAAG,CAAC,CAAC,UAAU,CACrD,OAAO,iCAAiC,CACxC,CAAA;AAED,MAAM,MAAM,iCAAiC,GAC1C;IACA,MAAM,EAAE,SAAS,CAAA;IACjB,YAAY,EAAE,2BAA2B,CAAA;CACxC,GACD;IACA,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,wBAAwB,CAAA;CAC9B,CAAA;AAEJ,MAAM,MAAM,8BAA8B,GAAG,CAC5C,OAAO,EAAE,qBAAqB,KAC1B,OAAO,CAAC,iCAAiC,CAAC,CAAA"}

package/dist/lifecycle/types.js

@@ -1 +1,23 @@
-export {};
+import { notionContrastModeSchema } from "../protocol/contrast.js";
+import { notionDataSourceBindingsSchema } from "../protocol/dataSources/dataSource.js";
+import { notionBlockIdSchema } from "../protocol/ids.js";
+import { manifestSchema } from "../protocol/manifest.js";
+import { customBlockPageSchema } from "../protocol/pages/page.js";
+import { notionParentSchema } from "../protocol/parent.js";
+import { notionThemeSchema } from "../protocol/theme.js";
+import { notionUserSchema } from "../protocol/users/user.js";
+import * as v from "valibot";
+export const customBlockHostInitialStateSchema = v.object({
+    theme: notionThemeSchema,
+    /**
+     * Defaults to standard for existing host integrations.
+     * TODO(custom-blocks): Make this required when MIN_HOST_SUPPORTED_BRIDGE_PROTOCOL_VERSION increases to 4.
+     */
+    contrastMode: v.optional(notionContrastModeSchema),
+    blockId: notionBlockIdSchema,
+    parent: notionParentSchema,
+    page: customBlockPageSchema,
+    manifest: manifestSchema,
+    dataSources: v.object({ bindings: notionDataSourceBindingsSchema }),
+    currentUser: notionUserSchema,
+});

package/dist/messages/types.d.ts

@@ -1,25 +1,30 @@
 import type { CreatePageMessage, createPageMessageSchema } from "../protocol/messages/createPage.js";
-import type { CreatePageResultMessage, CustomBlockCreatePageErrorInfo } from "../protocol/messages/createPageResult.js";
-import type { CustomBlockGetPageErrorInfo, GetPageMessage, GetPageResultMessage, getPageMessageSchema } from "../protocol/messages/getPage.js";
-import type { CustomBlockGetUserErrorInfo, GetUserMessage, GetUserResultMessage, getUserMessageSchema } from "../protocol/messages/getUser.js";
+import type { CustomBlockCreatePageErrorInfo, createPageResultMessageSchema } from "../protocol/messages/createPageResult.js";
+import type { CustomBlockGetPageErrorInfo, GetPageMessage, getPageMessageSchema, getPageResultMessageSchema } from "../protocol/messages/getPage.js";
+import type { CustomBlockGetUserErrorInfo, GetUserMessage, getUserMessageSchema, getUserResultMessageSchema } from "../protocol/messages/getUser.js";
 import type { CustomBlockInitErrorInfo } from "../protocol/messages/init.js";
 import type { CustomBlockInitResultErrorInfo } from "../protocol/messages/initResult.js";
-import type { CustomBlockListUsersErrorInfo, ListUsersMessage, ListUsersResultMessage, listUsersMessageSchema } from "../protocol/messages/listUsers.js";
+import type { CustomBlockListUsersErrorInfo, ListUsersMessage, listUsersMessageSchema, listUsersResultMessageSchema } from "../protocol/messages/listUsers.js";
 import type { BridgeMessagePayload } from "../protocol/messages/messagePayload.js";
-import type { CustomBlockOpenPageErrorInfo, OpenPageMessage, OpenPageResultMessage, openPageMessageSchema } from "../protocol/messages/openPage.js";
+import type { CustomBlockOpenPageErrorInfo, OpenPageMessage, openPageMessageSchema, openPageResultMessageSchema } from "../protocol/messages/openPage.js";
 import type { QueryDataSourceMessage, queryDataSourceMessageSchema } from "../protocol/messages/queryDataSource.js";
 import type { ResizeMessage, resizeMessageSchema } from "../protocol/messages/resize.js";
 import type { UpdatePageMessage, updatePageMessageSchema } from "../protocol/messages/updatePage.js";
-import type { CustomBlockUpdatePageErrorInfo, UpdatePageResultMessage } from "../protocol/messages/updatePageResult.js";
+import type { CustomBlockUpdatePageErrorInfo, updatePageResultMessageSchema } from "../protocol/messages/updatePageResult.js";
 import type { InferInput } from "valibot";
 import type { CustomBlockHostQueryDataSourceResult } from "../queries/types.js";
 type MaybePromise<T> = T | Promise<T>;
-export type CustomBlockHostCreatePageResult = BridgeMessagePayload<CreatePageResultMessage, CustomBlockCreatePageErrorInfo>;
-export type CustomBlockHostGetPageResult = BridgeMessagePayload<GetPageResultMessage, CustomBlockGetPageErrorInfo>;
-export type CustomBlockHostUpdatePageResult = BridgeMessagePayload<UpdatePageResultMessage, CustomBlockUpdatePageErrorInfo>;
-export type CustomBlockHostGetUserResult = BridgeMessagePayload<GetUserResultMessage, CustomBlockGetUserErrorInfo>;
-export type CustomBlockHostListUsersResult = BridgeMessagePayload<ListUsersResultMessage, CustomBlockListUsersErrorInfo>;
-export type CustomBlockHostOpenPageResult = BridgeMessagePayload<OpenPageResultMessage, CustomBlockOpenPageErrorInfo>;
+/**
+ * Host results use InferInput so adapters can return plain string IDs.
+ * The runtime validates results before sending them and assigns protocol ID brands.
+ * Handler requests use parsed protocol types, whose IDs are already branded.
+ */
+export type CustomBlockHostCreatePageResult = BridgeMessagePayload<InferInput<typeof createPageResultMessageSchema>, CustomBlockCreatePageErrorInfo>;
+export type CustomBlockHostGetPageResult = BridgeMessagePayload<InferInput<typeof getPageResultMessageSchema>, CustomBlockGetPageErrorInfo>;
+export type CustomBlockHostUpdatePageResult = BridgeMessagePayload<InferInput<typeof updatePageResultMessageSchema>, CustomBlockUpdatePageErrorInfo>;
+export type CustomBlockHostGetUserResult = BridgeMessagePayload<InferInput<typeof getUserResultMessageSchema>, CustomBlockGetUserErrorInfo>;
+export type CustomBlockHostListUsersResult = BridgeMessagePayload<InferInput<typeof listUsersResultMessageSchema>, CustomBlockListUsersErrorInfo>;
+export type CustomBlockHostOpenPageResult = BridgeMessagePayload<InferInput<typeof openPageResultMessageSchema>, CustomBlockOpenPageErrorInfo>;
 export type CustomBlockHostHandlers = {
     queryDataSource: (message: QueryDataSourceMessage) => MaybePromise<CustomBlockHostQueryDataSourceResult>;
     createPage?: (message: CreatePageMessage) => MaybePromise<CustomBlockHostCreatePageResult>;

package/dist/messages/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/messages/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/messages/types.ts"],"names":[],"mappings":"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"}

package/dist/queries/types.d.ts

@@ -1,4 +1,5 @@
 import type { BridgeMessagePayload } from "../protocol/messages/messagePayload.js";
-import type { CustomBlockQueryDataSourceErrorInfo, QueryDataSourceResultMessage } from "../protocol/messages/queryDataSourceResult.js";
-export type CustomBlockHostQueryDataSourceResult = BridgeMessagePayload<QueryDataSourceResultMessage, CustomBlockQueryDataSourceErrorInfo>;
+import type { CustomBlockQueryDataSourceErrorInfo, queryDataSourceResultMessageSchema } from "../protocol/messages/queryDataSourceResult.js";
+import type { InferInput } from "valibot";
+export type CustomBlockHostQueryDataSourceResult = BridgeMessagePayload<InferInput<typeof queryDataSourceResultMessageSchema>, CustomBlockQueryDataSourceErrorInfo>;
 //# sourceMappingURL=types.d.ts.map

package/dist/queries/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/queries/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6DAA6D,CAAA;AACvG,OAAO,KAAK,EACX,mCAAmC,EACnC,4BAA4B,EAC5B,MAAM,oEAAoE,CAAA;AAE3E,MAAM,MAAM,oCAAoC,GAAG,oBAAoB,CACtE,4BAA4B,EAC5B,mCAAmC,CACnC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/queries/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6DAA6D,CAAA;AACvG,OAAO,KAAK,EACX,mCAAmC,EACnC,kCAAkC,EAClC,MAAM,oEAAoE,CAAA;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEzC,MAAM,MAAM,oCAAoC,GAAG,oBAAoB,CACtE,UAAU,CAAC,OAAO,kCAAkC,CAAC,EACrD,mCAAmC,CACnC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notionhq/custom-blocks-host",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Reusable host runtime for Notion custom blocks.",
   "license": "MIT",
   "type": "module",
@@ -12,7 +12,8 @@
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "dependencies": {

package/src/createCustomBlockHost.ts

@@ -1,25 +1,32 @@
-import type { NotionContrastMode } from "@notionhq/custom-blocks-protocol/contrast.js"
+import type { notionContrastModeSchema } from "@notionhq/custom-blocks-protocol/contrast.js"
 import type { NotionCollectionSchema } from "@notionhq/custom-blocks-protocol/dataSources/dataSource.js"
+import { notionDataSourceBindingsSchema } from "@notionhq/custom-blocks-protocol/dataSources/dataSource.js"
 import type { NotionDataSourceId } from "@notionhq/custom-blocks-protocol/ids.js"
+import { notionDataSourceIdSchema } from "@notionhq/custom-blocks-protocol/ids.js"
 import type { CustomBlockManifest } from "@notionhq/custom-blocks-protocol/manifest.js"
-import type { HostToSandboxMessage } from "@notionhq/custom-blocks-protocol/messages/hostToSandbox.js"
-import type {
-	CustomBlockInitErrorCode,
-	InitMessage,
+import { manifestSchema } from "@notionhq/custom-blocks-protocol/manifest.js"
+import {
+	type HostToSandboxMessage,
+	hostToSandboxMessageSchema,
+} from "@notionhq/custom-blocks-protocol/messages/hostToSandbox.js"
+import {
+	type CustomBlockInitErrorCode,
+	initMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/init.js"
 import type { InvalidSandboxMessage } from "@notionhq/custom-blocks-protocol/messages/invalidSandboxMessage.js"
-import type { BridgeMessagePayload } from "@notionhq/custom-blocks-protocol/messages/messagePayload.js"
 import type { QueryDataSourceMessage } from "@notionhq/custom-blocks-protocol/messages/queryDataSource.js"
 import type {
 	CustomBlockQueryDataSourceErrorInfo,
-	QueryDataSourceResultMessage,
+	queryDataSourceResultMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/queryDataSourceResult.js"
 import type { SandboxToHostMessage } from "@notionhq/custom-blocks-protocol/messages/sandboxToHost.js"
-import type { CustomBlockPage } from "@notionhq/custom-blocks-protocol/pages/page.js"
-import type { NotionParent } from "@notionhq/custom-blocks-protocol/parent.js"
+import type { customBlockPageSchema } from "@notionhq/custom-blocks-protocol/pages/page.js"
+import type { notionParentSchema } from "@notionhq/custom-blocks-protocol/parent.js"
 import { LATEST_BRIDGE_PROTOCOL_VERSION } from "@notionhq/custom-blocks-protocol/protocolVersion.js"
-import type { NotionTheme } from "@notionhq/custom-blocks-protocol/theme.js"
-import type { NotionUser } from "@notionhq/custom-blocks-protocol/users/user.js"
+import type { notionThemeSchema } from "@notionhq/custom-blocks-protocol/theme.js"
+import type { notionUserSchema } from "@notionhq/custom-blocks-protocol/users/user.js"
+import type { InferInput } from "valibot"
+import * as v from "valibot"
 import { initErrorForFailureReason } from "./lifecycle/initErrors.js"
 import { createInitializationController } from "./lifecycle/initializationController.js"
 import { normalizeHostToSandboxMessage } from "./lifecycle/normalizeHostToSandboxMessage.js"
@@ -28,7 +35,9 @@ import type {
 	CustomBlockHostGetInitialState,
 	CustomBlockHostInitialState,
 	CustomBlockHostInitialStateResult,
+	CustomBlockHostNormalizedDataSourcesPayload,
 } from "./lifecycle/types.js"
+import { customBlockHostInitialStateSchema } from "./lifecycle/types.js"
 import { createSandboxMessageRouter } from "./messages/sandboxMessageRouter.js"
 import type {
 	CustomBlockHostFailure,
@@ -82,13 +91,17 @@ export type CustomBlockHostOptions = {
 
 export type CustomBlockHostHandle = {
 	stop: () => void
-	setTheme: (theme: NotionTheme) => void
-	setContrastMode: (contrastMode: NotionContrastMode) => void
-	setParent: (parent: NotionParent) => void
-	setPage: (page: CustomBlockPage) => void
+	setTheme: (theme: InferInput<typeof notionThemeSchema>) => void
+	setContrastMode: (
+		contrastMode: InferInput<typeof notionContrastModeSchema>,
+	) => void
+	setParent: (parent: InferInput<typeof notionParentSchema>) => void
+	setPage: (page: InferInput<typeof customBlockPageSchema>) => void
 	setDataSources: (dataSources: CustomBlockHostDataSourcesPayload) => void
-	setCurrentUser: (currentUser: NotionUser) => void
-	refreshQuery: (args: { dataSourceId: NotionDataSourceId }) => void
+	setCurrentUser: (currentUser: InferInput<typeof notionUserSchema>) => void
+	refreshQuery: (args: {
+		dataSourceId: InferInput<typeof notionDataSourceIdSchema>
+	}) => void
 }
 
 /**
@@ -97,23 +110,6 @@ export type CustomBlockHostHandle = {
  */
 type OneShotRequest = Extract<SandboxToHostMessage, { requestId: string }>
 
-/** The matching host result message, named `<request type>Result` by the protocol. */
-type ResultForRequest<Request extends OneShotRequest> = Extract<
-	HostToSandboxMessage,
-	{ type: `${Request["type"]}Result` }
->
-
-/** The result's success or error payload, without the bridge envelope fields. */
-type ResultPayloadForRequest<Request extends OneShotRequest> =
-	BridgeMessagePayload<ResultForRequest<Request>>
-
-/** Returns one result payload. `respondToRequest` adds the message type and request ID. */
-type OneShotHandler<Request extends OneShotRequest> = (
-	message: Request,
-) =>
-	| ResultPayloadForRequest<Request>
-	| Promise<ResultPayloadForRequest<Request>>
-
 export function createCustomBlockHost(
 	options: CustomBlockHostOptions,
 ): CustomBlockHostHandle {
@@ -145,7 +141,7 @@ export function createCustomBlockHost(
 	let pendingState: HostStateUpdates = {}
 	let hasPreparedInitialState = false
 	let manifest: CustomBlockManifest | undefined
-	let activeDataSources: CustomBlockHostDataSourcesPayload | undefined
+	let activeDataSources: CustomBlockHostNormalizedDataSourcesPayload | undefined
 	let sandboxBridgeProtocolVersion = LATEST_BRIDGE_PROTOCOL_VERSION
 	const querySubscriptions = new QuerySubscriptions()
 
@@ -177,24 +173,19 @@ export function createCustomBlockHost(
 		iframe.contentWindow?.postMessage(sandboxMessage, sandboxOrigin)
 	}
 
-	function sendInitMessage(message: InitMessage) {
-		postToSandbox(message)
+	function sendInitMessage(message: InferInput<typeof initMessageSchema>) {
+		postToSandbox(v.parse(initMessageSchema, message))
 	}
 
 	function sendNack(message: InvalidSandboxMessage) {
 		postToSandbox(message)
 	}
 
-	function sendInitializedMessage(
-		message: Exclude<
-			HostToSandboxMessage,
-			{ type: "init" | "invalidSandboxMessage" }
-		>,
-	) {
+	function sendInitializedMessage(message: unknown) {
 		const status = initializationController.status
 		switch (status) {
 			case "initialized":
-				postToSandbox(message)
+				postToSandbox(v.parse(hostToSandboxMessageSchema, message))
 				return
 			// Send state updates and handler results only after initialization succeeds.
 			case "waitingForConnect":
@@ -212,27 +203,29 @@ export function createCustomBlockHost(
 	 * Invokes a one-shot handler and posts its result with the request's ID.
 	 * Each result type is named `<request type>Result` by the bridge protocol.
 	 */
-	async function respondToRequest<Request extends OneShotRequest>(
+	async function respondToRequest<
+		Request extends OneShotRequest,
+		Response extends object,
+	>(
 		message: Request,
-		handler: OneShotHandler<Request> | undefined,
+		handler: ((message: Request) => Response | Promise<Response>) | undefined,
 	) {
 		if (handler === undefined) {
 			return
 		}
 		const response = await handler(message)
-		const result = {
+		sendInitializedMessage({
 			type: `${message.type}Result` as const,
 			requestId: message.requestId,
 			...response,
-		} as ResultForRequest<OneShotRequest>
-		sendInitializedMessage(result)
+		})
 	}
 
 	function postQueryDataSourceResult(args: {
 		subscriptionId: string
 		response: CustomBlockHostQueryDataSourceResult
 	}) {
-		const message: QueryDataSourceResultMessage =
+		const message: InferInput<typeof queryDataSourceResultMessageSchema> =
 			args.response.status === "error"
 				? {
 						type: "queryDataSourceResult",
@@ -357,10 +350,20 @@ export function createCustomBlockHost(
 		if (result.status === "error") {
 			return result
 		}
-		manifest = result.initialState.manifest
+		manifest = v.parse(manifestSchema, result.initialState.manifest)
 		onManifest?.(manifest)
-		const initialState = { ...result.initialState, ...pendingState }
+		const initialStateInput = {
+			...result.initialState,
+			...pendingState,
+		}
 		pendingState = {}
+		const initialState = {
+			...v.parse(
+				v.omit(customBlockHostInitialStateSchema, ["manifest"]),
+				initialStateInput,
+			),
+			manifest,
+		}
 		if (
 			sandboxBridgeProtocolVersion <
 				BRIDGE_PROTOCOL_VERSION_INTRODUCING_UNAVAILABLE_PAGE &&
@@ -454,25 +457,36 @@ export function createCustomBlockHost(
 			updateHostState({ currentUser })
 		},
 		setDataSources(dataSources) {
+			const normalizedDataSources: CustomBlockHostNormalizedDataSourcesPayload =
+				{
+					bindings: v.parse(
+						notionDataSourceBindingsSchema,
+						dataSources.bindings,
+					),
+				}
 			if (
 				initializationController.hasConnectedSandbox &&
 				manifest !== undefined &&
-				getBindingErrorCode(manifest, dataSources) !== undefined
+				getBindingErrorCode(manifest, normalizedDataSources) !== undefined
 			) {
 				emit("warn", {
 					message: "Ignored invalid data source bindings update",
-					payload: dataSources,
+					payload: normalizedDataSources,
 				})
 				return
 			}
-			activeDataSources = dataSources
-			updateHostState({ dataSources })
+			activeDataSources = normalizedDataSources
+			updateHostState({ dataSources: normalizedDataSources })
 		},
 		refreshQuery({ dataSourceId }) {
 			if (initializationController.status !== "initialized") {
 				return
 			}
-			const refreshes = querySubscriptions.refresh(dataSourceId)
+			const normalizedDataSourceId = v.parse(
+				notionDataSourceIdSchema,
+				dataSourceId,
+			)
+			const refreshes = querySubscriptions.refresh(normalizedDataSourceId)
 			if (refreshes.length === 0) {
 				emit("warn", `No active query exists for data source "${dataSourceId}"`)
 				return
@@ -485,7 +499,7 @@ export function createCustomBlockHost(
 }
 
 function getCollectionSchema(
-	dataSources: CustomBlockHostDataSourcesPayload | undefined,
+	dataSources: CustomBlockHostNormalizedDataSourcesPayload | undefined,
 	dataSourceId: NotionDataSourceId,
 ) {
 	return Object.values(dataSources?.bindings ?? {}).find(
@@ -494,7 +508,7 @@ function getCollectionSchema(
 }
 
 function getBindingErrorCode(
-	manifest: CustomBlockManifest,
+	manifest: InferInput<typeof manifestSchema>,
 	dataSources: CustomBlockHostDataSourcesPayload,
 ): CustomBlockInitErrorCode | undefined {
 	for (const [dataSourceKey, manifestDataSource] of Object.entries(

package/src/index.ts

@@ -1,15 +1,35 @@
+export type { CustomBlockErrorInfo } from "@notionhq/custom-blocks-protocol/errors.js"
 export type { CreatePageMessage } from "@notionhq/custom-blocks-protocol/messages/createPage.js"
 export type { GetPageMessage } from "@notionhq/custom-blocks-protocol/messages/getPage.js"
 export type { GetUserMessage } from "@notionhq/custom-blocks-protocol/messages/getUser.js"
 export type { ListUsersMessage } from "@notionhq/custom-blocks-protocol/messages/listUsers.js"
 export type { OpenPageMessage } from "@notionhq/custom-blocks-protocol/messages/openPage.js"
-export type { QueryDataSourceMessage } from "@notionhq/custom-blocks-protocol/messages/queryDataSource.js"
+export type {
+	CustomBlockCheckboxFilterOperator,
+	CustomBlockContainsFilterOperator,
+	CustomBlockCreatedByFilterOperator,
+	CustomBlockDateFilterOperator,
+	CustomBlockNumberFilterOperator,
+	CustomBlockOptionFilterOperator,
+	CustomBlockPeopleFilterOperator,
+	CustomBlockPersonFilterValue,
+	CustomBlockTextFilterOperator,
+	QueryDataSourceMessage,
+	ResolvedCustomBlockDataSourceFilter,
+	ResolvedCustomBlockDataSourcePropertyFilter,
+	ResolvedCustomBlockDataSourceSort,
+} from "@notionhq/custom-blocks-protocol/messages/queryDataSource.js"
 export type { ResizeMessage } from "@notionhq/custom-blocks-protocol/messages/resize.js"
 export type { UpdatePageMessage } from "@notionhq/custom-blocks-protocol/messages/updatePage.js"
 export type {
+	NotionDateInput,
+	NotionFileInput,
+	NotionPageCover,
+	NotionPageIcon,
 	NotionPagePropertyValue,
 	NotionPagePropertyWriteMap,
 	NotionRichTextItem,
+	NotionSelectOptionInput,
 } from "@notionhq/custom-blocks-protocol/pages/page.js"
 export {
 	type AutoBindableProperty,

package/src/lifecycle/initializationController.ts

@@ -2,9 +2,10 @@ import { DEFAULT_CONTRAST_MODE } from "@notionhq/custom-blocks-protocol/contrast
 import type { ConnectMessage } from "@notionhq/custom-blocks-protocol/messages/connect.js"
 import type {
 	CustomBlockInitErrorInfo,
-	InitMessage,
+	initMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/init.js"
 import type { InitResultMessage } from "@notionhq/custom-blocks-protocol/messages/initResult.js"
+import type { InferInput } from "valibot"
 import type { CustomBlockHostFailure } from "../messages/types.js"
 import { unreachable } from "../utils.js"
 import { initErrorForFailureReason } from "./initErrors.js"
@@ -23,7 +24,7 @@ export type InitializationControllerOptions = {
 	prepareInit: (
 		connect: ConnectSuccessMessage,
 	) => Promise<CustomBlockHostInitialStateResult>
-	sendInitMessage: (message: InitMessage) => void
+	sendInitMessage: (message: InferInput<typeof initMessageSchema>) => void
 	warn: (payload: unknown) => void
 	flushPendingHostStateChanges: () => void
 	minBridgeProtocolVersion: number
@@ -162,7 +163,7 @@ export function createInitializationController(
 				return
 			}
 			initStatus = "waitingForInitResult"
-			const message: InitMessage = {
+			const message: InferInput<typeof initMessageSchema> = {
 				type: "init",
 				initializationId: connect.initializationId,
 				status: "success",

package/src/lifecycle/types.ts

@@ -1,13 +1,14 @@
-import type { NotionContrastMode } from "@notionhq/custom-blocks-protocol/contrast.js"
-import type { NotionDataSourceBindings } from "@notionhq/custom-blocks-protocol/dataSources/dataSource.js"
-import type { NotionBlockId } from "@notionhq/custom-blocks-protocol/ids.js"
-import type { CustomBlockManifest } from "@notionhq/custom-blocks-protocol/manifest.js"
+import { notionContrastModeSchema } from "@notionhq/custom-blocks-protocol/contrast.js"
+import { notionDataSourceBindingsSchema } from "@notionhq/custom-blocks-protocol/dataSources/dataSource.js"
+import { notionBlockIdSchema } from "@notionhq/custom-blocks-protocol/ids.js"
+import { manifestSchema } from "@notionhq/custom-blocks-protocol/manifest.js"
 import type { ConnectMessage } from "@notionhq/custom-blocks-protocol/messages/connect.js"
 import type { CustomBlockInitErrorInfo } from "@notionhq/custom-blocks-protocol/messages/init.js"
-import type { CustomBlockPage } from "@notionhq/custom-blocks-protocol/pages/page.js"
-import type { NotionParent } from "@notionhq/custom-blocks-protocol/parent.js"
-import type { NotionTheme } from "@notionhq/custom-blocks-protocol/theme.js"
-import type { NotionUser } from "@notionhq/custom-blocks-protocol/users/user.js"
+import { customBlockPageSchema } from "@notionhq/custom-blocks-protocol/pages/page.js"
+import { notionParentSchema } from "@notionhq/custom-blocks-protocol/parent.js"
+import { notionThemeSchema } from "@notionhq/custom-blocks-protocol/theme.js"
+import { notionUserSchema } from "@notionhq/custom-blocks-protocol/users/user.js"
+import * as v from "valibot"
 
 export type ConnectSuccessMessage = Extract<
 	ConnectMessage,
@@ -30,23 +31,31 @@ export type InitStatus =
 	| "stopped"
 
 export type CustomBlockHostDataSourcesPayload = {
-	bindings: NotionDataSourceBindings
+	bindings: v.InferInput<typeof notionDataSourceBindingsSchema>
 }
 
-export type CustomBlockHostInitialState = {
-	theme: NotionTheme
+export type CustomBlockHostNormalizedDataSourcesPayload = {
+	bindings: v.InferOutput<typeof notionDataSourceBindingsSchema>
+}
+
+export const customBlockHostInitialStateSchema = v.object({
+	theme: notionThemeSchema,
 	/**
 	 * Defaults to standard for existing host integrations.
 	 * TODO(custom-blocks): Make this required when MIN_HOST_SUPPORTED_BRIDGE_PROTOCOL_VERSION increases to 4.
 	 */
-	contrastMode?: NotionContrastMode
-	blockId: NotionBlockId
-	parent: NotionParent
-	page: CustomBlockPage
-	manifest: CustomBlockManifest
-	dataSources: CustomBlockHostDataSourcesPayload
-	currentUser: NotionUser
-}
+	contrastMode: v.optional(notionContrastModeSchema),
+	blockId: notionBlockIdSchema,
+	parent: notionParentSchema,
+	page: customBlockPageSchema,
+	manifest: manifestSchema,
+	dataSources: v.object({ bindings: notionDataSourceBindingsSchema }),
+	currentUser: notionUserSchema,
+})
+
+export type CustomBlockHostInitialState = v.InferInput<
+	typeof customBlockHostInitialStateSchema
+>
 
 export type CustomBlockHostInitialStateResult =
 	| {

package/src/messages/types.ts

@@ -3,35 +3,35 @@ import type {
 	createPageMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/createPage.js"
 import type {
-	CreatePageResultMessage,
 	CustomBlockCreatePageErrorInfo,
+	createPageResultMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/createPageResult.js"
 import type {
 	CustomBlockGetPageErrorInfo,
 	GetPageMessage,
-	GetPageResultMessage,
 	getPageMessageSchema,
+	getPageResultMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/getPage.js"
 import type {
 	CustomBlockGetUserErrorInfo,
 	GetUserMessage,
-	GetUserResultMessage,
 	getUserMessageSchema,
+	getUserResultMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/getUser.js"
 import type { CustomBlockInitErrorInfo } from "@notionhq/custom-blocks-protocol/messages/init.js"
 import type { CustomBlockInitResultErrorInfo } from "@notionhq/custom-blocks-protocol/messages/initResult.js"
 import type {
 	CustomBlockListUsersErrorInfo,
 	ListUsersMessage,
-	ListUsersResultMessage,
 	listUsersMessageSchema,
+	listUsersResultMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/listUsers.js"
 import type { BridgeMessagePayload } from "@notionhq/custom-blocks-protocol/messages/messagePayload.js"
 import type {
 	CustomBlockOpenPageErrorInfo,
 	OpenPageMessage,
-	OpenPageResultMessage,
 	openPageMessageSchema,
+	openPageResultMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/openPage.js"
 import type {
 	QueryDataSourceMessage,
@@ -47,40 +47,45 @@ import type {
 } from "@notionhq/custom-blocks-protocol/messages/updatePage.js"
 import type {
 	CustomBlockUpdatePageErrorInfo,
-	UpdatePageResultMessage,
+	updatePageResultMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/updatePageResult.js"
 import type { InferInput } from "valibot"
 import type { CustomBlockHostQueryDataSourceResult } from "../queries/types.js"
 
 type MaybePromise<T> = T | Promise<T>
 
+/**
+ * Host results use InferInput so adapters can return plain string IDs.
+ * The runtime validates results before sending them and assigns protocol ID brands.
+ * Handler requests use parsed protocol types, whose IDs are already branded.
+ */
 export type CustomBlockHostCreatePageResult = BridgeMessagePayload<
-	CreatePageResultMessage,
+	InferInput<typeof createPageResultMessageSchema>,
 	CustomBlockCreatePageErrorInfo
 >
 
 export type CustomBlockHostGetPageResult = BridgeMessagePayload<
-	GetPageResultMessage,
+	InferInput<typeof getPageResultMessageSchema>,
 	CustomBlockGetPageErrorInfo
 >
 
 export type CustomBlockHostUpdatePageResult = BridgeMessagePayload<
-	UpdatePageResultMessage,
+	InferInput<typeof updatePageResultMessageSchema>,
 	CustomBlockUpdatePageErrorInfo
 >
 
 export type CustomBlockHostGetUserResult = BridgeMessagePayload<
-	GetUserResultMessage,
+	InferInput<typeof getUserResultMessageSchema>,
 	CustomBlockGetUserErrorInfo
 >
 
 export type CustomBlockHostListUsersResult = BridgeMessagePayload<
-	ListUsersResultMessage,
+	InferInput<typeof listUsersResultMessageSchema>,
 	CustomBlockListUsersErrorInfo
 >
 
 export type CustomBlockHostOpenPageResult = BridgeMessagePayload<
-	OpenPageResultMessage,
+	InferInput<typeof openPageResultMessageSchema>,
 	CustomBlockOpenPageErrorInfo
 >
 

package/src/queries/types.ts

@@ -1,10 +1,11 @@
 import type { BridgeMessagePayload } from "@notionhq/custom-blocks-protocol/messages/messagePayload.js"
 import type {
 	CustomBlockQueryDataSourceErrorInfo,
-	QueryDataSourceResultMessage,
+	queryDataSourceResultMessageSchema,
 } from "@notionhq/custom-blocks-protocol/messages/queryDataSourceResult.js"
+import type { InferInput } from "valibot"
 
 export type CustomBlockHostQueryDataSourceResult = BridgeMessagePayload<
-	QueryDataSourceResultMessage,
+	InferInput<typeof queryDataSourceResultMessageSchema>,
 	CustomBlockQueryDataSourceErrorInfo
 >