@notionhq/custom-blocks-host 0.3.4 → 0.3.5

package/dist/protocol/messages/hostToSandbox.js

@@ -12,13 +12,10 @@ import { openExternalUrlResultMessageSchema } from "./openExternalUrl.js";
 import { openPageResultMessageSchema } from "./openPage.js";
 import { pageChangedMessageSchema } from "./pageChanged.js";
 import { parentChangedMessageSchema } from "./parentChanged.js";
-import { queryDataSourceResultMessageSchema } from "./queryDataSourceResult.js";
+import { queryDataSourceResultMessageLegacySchema, queryDataSourceResultMessageSchema, } from "./queryDataSourceResult.js";
 import { themeChangedMessageSchema } from "./themeChanged.js";
 import { updatePageResultMessageSchema } from "./updatePageResult.js";
-/**
- * Discriminated union of every message the host is allowed to send the sandbox.
- */
-export const hostToSandboxMessageSchema = v.variant("type", [
+const baseHostToSandboxMessageSchema = v.variant("type", [
     initMessageSchema,
     themeChangedMessageSchema,
     contrastModeChangedMessageSchema,
@@ -26,7 +23,6 @@ export const hostToSandboxMessageSchema = v.variant("type", [
     pageChangedMessageSchema,
     currentUserChangedMessageSchema,
     dataSourcesChangedMessageSchema,
-    queryDataSourceResultMessageSchema,
     createPageResultMessageSchema,
     getPageResultMessageSchema,
     getUserResultMessageSchema,
@@ -36,3 +32,14 @@ export const hostToSandboxMessageSchema = v.variant("type", [
     updatePageResultMessageSchema,
     invalidSandboxMessageSchema,
 ]);
+export const hostToSandboxMessageSchema = v.variant("type", [
+    ...baseHostToSandboxMessageSchema.options,
+    queryDataSourceResultMessageSchema,
+]);
+/**
+ * Discriminated union of every message the host is allowed to send the sandbox.
+ */
+export const hostToSandboxMessageLegacySchema = v.variant("type", [
+    ...baseHostToSandboxMessageSchema.options,
+    queryDataSourceResultMessageLegacySchema,
+]);

package/dist/protocol/messages/queryDataSourceResult.d.ts

@@ -12,6 +12,179 @@ export declare const customBlockQueryDataSourceErrorInfoSchema: v.ObjectSchema<{
  * Message sent by the host to update a `queryDataSource` subscription.
  */
 export declare const queryDataSourceResultMessageSchema: v.VariantSchema<"status", [v.ObjectSchema<{
+    readonly type: v.LiteralSchema<"queryDataSourceResult", undefined>;
+    readonly subscriptionId: v.StringSchema<undefined>;
+    readonly status: v.LiteralSchema<"success", undefined>;
+    readonly items: v.ArraySchema<v.ObjectSchema<{
+        readonly id: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.BrandAction<string, "NotionPageId">]>;
+        readonly is_archived: v.BooleanSchema<undefined>;
+        readonly in_trash: v.BooleanSchema<undefined>;
+        readonly properties: v.RecordSchema<v.StringSchema<undefined>, v.OptionalSchema<v.VariantSchema<"type", [v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"title", undefined>;
+            readonly title: v.ArraySchema<v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"rich_text", undefined>;
+            readonly rich_text: v.ArraySchema<v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"number", undefined>;
+            readonly number: v.NullableSchema<v.NumberSchema<undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"url", undefined>;
+            readonly url: v.NullableSchema<v.StringSchema<undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"email", undefined>;
+            readonly email: v.NullableSchema<v.StringSchema<undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"phone_number", undefined>;
+            readonly phone_number: v.NullableSchema<v.StringSchema<undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"checkbox", undefined>;
+            readonly checkbox: v.BooleanSchema<undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"select", undefined>;
+            readonly select: v.NullableSchema<v.UnionSchema<[v.ObjectSchema<{
+                readonly id: v.StringSchema<undefined>;
+                readonly name: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly color: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly description: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+            }, undefined>, v.ObjectSchema<{
+                readonly name: v.StringSchema<undefined>;
+                readonly id: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly color: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly description: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+            }, undefined>], undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"status", undefined>;
+            readonly status: v.NullableSchema<v.UnionSchema<[v.ObjectSchema<{
+                readonly id: v.StringSchema<undefined>;
+                readonly name: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly color: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly description: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+            }, undefined>, v.ObjectSchema<{
+                readonly name: v.StringSchema<undefined>;
+                readonly id: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly color: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly description: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+            }, undefined>], undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"multi_select", undefined>;
+            readonly multi_select: v.ArraySchema<v.UnionSchema<[v.ObjectSchema<{
+                readonly id: v.StringSchema<undefined>;
+                readonly name: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly color: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly description: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+            }, undefined>, v.ObjectSchema<{
+                readonly name: v.StringSchema<undefined>;
+                readonly id: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly color: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                readonly description: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+            }, undefined>], undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"date", undefined>;
+            readonly date: v.NullableSchema<v.ObjectSchema<{
+                readonly start: v.StringSchema<undefined>;
+                readonly end: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+                readonly time_zone: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+            }, undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"people", undefined>;
+            readonly people: v.ArraySchema<v.UnionSchema<[v.ObjectSchema<{
+                readonly object: v.OptionalSchema<v.LiteralSchema<"user", undefined>, undefined>;
+                readonly id: v.StringSchema<undefined>;
+            }, undefined>, v.ObjectSchema<{
+                readonly object: v.LiteralSchema<"group", undefined>;
+                readonly id: v.StringSchema<undefined>;
+                readonly name: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+            }, undefined>], undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"relation", undefined>;
+            readonly has_more: v.OptionalSchema<v.BooleanSchema<undefined>, undefined>;
+            readonly relation: v.ArraySchema<v.ObjectSchema<{
+                readonly id: v.StringSchema<undefined>;
+            }, undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"files", undefined>;
+            readonly files: v.ArraySchema<v.UnionSchema<[v.ObjectSchema<{
+                readonly type: v.LiteralSchema<"external", undefined>;
+                readonly name: v.StringSchema<undefined>;
+                readonly external: v.ObjectSchema<{
+                    readonly url: v.StringSchema<undefined>;
+                }, undefined>;
+            }, undefined>, v.ObjectSchema<{
+                readonly type: v.LiteralSchema<"file", undefined>;
+                readonly name: v.StringSchema<undefined>;
+                readonly file: v.ObjectSchema<{
+                    readonly url: v.StringSchema<undefined>;
+                    readonly expiry_time: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+                }, undefined>;
+            }, undefined>], undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"place", undefined>;
+            readonly place: v.NullableSchema<v.ObjectSchema<{
+                readonly lat: v.NumberSchema<undefined>;
+                readonly lon: v.NumberSchema<undefined>;
+                readonly name: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+                readonly address: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+                readonly aws_place_id: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+                readonly google_place_id: v.OptionalSchema<v.NullableSchema<v.StringSchema<undefined>, undefined>, undefined>;
+            }, undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"created_time", undefined>;
+            readonly created_time: v.NullableSchema<v.StringSchema<undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"last_edited_time", undefined>;
+            readonly last_edited_time: v.NullableSchema<v.StringSchema<undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"created_by", undefined>;
+            readonly created_by: v.NullableSchema<v.ObjectSchema<{
+                readonly id: v.StringSchema<undefined>;
+                readonly table: v.PicklistSchema<["notion_user", "bot", "organization_bot"], undefined>;
+                readonly spaceId: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+            }, undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"last_edited_by", undefined>;
+            readonly last_edited_by: v.NullableSchema<v.ObjectSchema<{
+                readonly id: v.StringSchema<undefined>;
+                readonly table: v.PicklistSchema<["notion_user", "bot", "organization_bot"], undefined>;
+                readonly spaceId: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+            }, undefined>, undefined>;
+        }, undefined>, v.ObjectSchema<{
+            readonly id: v.StringSchema<undefined>;
+            readonly type: v.LiteralSchema<"last_visited_time", undefined>;
+            readonly last_visited_time: v.NullableSchema<v.StringSchema<undefined>, undefined>;
+        }, undefined>], undefined>, undefined>, undefined>;
+    }, undefined>, undefined>;
+    readonly hasMore: v.BooleanSchema<undefined>;
+}, undefined>, v.ObjectSchema<{
+    readonly type: v.LiteralSchema<"queryDataSourceResult", undefined>;
+    readonly subscriptionId: v.StringSchema<undefined>;
+    readonly status: v.LiteralSchema<"error", undefined>;
+    readonly error: v.ObjectSchema<{
+        readonly code: v.StringSchema<undefined>;
+        readonly message: v.StringSchema<undefined>;
+        readonly isRetryable: v.BooleanSchema<undefined>;
+    }, undefined>;
+}, undefined>], undefined>;
+export declare const queryDataSourceResultMessageLegacySchema: v.VariantSchema<"status", [v.ObjectSchema<{
     readonly type: v.LiteralSchema<"queryDataSourceResult", undefined>;
     readonly subscriptionId: v.StringSchema<undefined>;
     readonly status: v.LiteralSchema<"success", undefined>;
@@ -250,3 +423,4 @@ export declare const queryDataSourceResultMessageSchema: v.VariantSchema<"status
     }, undefined>;
 }, undefined>], undefined>;
 export type QueryDataSourceResultMessage = v.InferOutput<typeof queryDataSourceResultMessageSchema>;
+export type QueryDataSourceResultMessageLegacy = v.InferOutput<typeof queryDataSourceResultMessageLegacySchema>;

package/dist/protocol/messages/queryDataSourceResult.js

@@ -12,6 +12,21 @@ export const customBlockQueryDataSourceErrorInfoSchema = v.object({
  * Message sent by the host to update a `queryDataSource` subscription.
  */
 export const queryDataSourceResultMessageSchema = v.variant("status", [
+    v.object({
+        type: v.literal("queryDataSourceResult"),
+        subscriptionId: v.string(),
+        status: v.literal("success"),
+        items: v.array(notionDataSourcePageBridgeSchema),
+        hasMore: v.boolean(),
+    }),
+    v.object({
+        type: v.literal("queryDataSourceResult"),
+        subscriptionId: v.string(),
+        status: v.literal("error"),
+        error: customBlockQueryDataSourceErrorInfoSchema,
+    }),
+]);
+export const queryDataSourceResultMessageLegacySchema = v.variant("status", [
     v.object({
         type: v.literal("queryDataSourceResult"),
         subscriptionId: v.string(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notionhq/custom-blocks-host",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Reusable host runtime for Notion custom blocks.",
   "license": "MIT",
   "type": "module",

package/src/lifecycle/legacyPage.ts

@@ -0,0 +1,183 @@
+import type { NotionDataSourcePageBridge } from "@notionhq/custom-blocks-protocol/dataSources/dataSourcePage.js"
+import type { NotionDataSourceValue } from "@notionhq/custom-blocks-protocol/dataSources/dataSourceValue.js"
+import type { NotionPagePropertyValue } from "@notionhq/custom-blocks-protocol/pages/page.js"
+import { unreachable } from "../utils.js"
+
+export function toLegacyQueryPage(page: NotionDataSourcePageBridge) {
+	const propertiesById: Record<string, NotionDataSourceValue | undefined> = {}
+	for (const property of Object.values(page.properties)) {
+		if (property) {
+			propertiesById[property.id] = toLegacyProperty(property)
+		}
+	}
+	return {
+		id: page.id,
+		is_archived: page.is_archived,
+		in_trash: page.in_trash,
+		propertiesById,
+	}
+}
+
+function plainText(items: Record<string, unknown>[]): string {
+	return items
+		.map(item => {
+			if (typeof item.plain_text === "string") {
+				return item.plain_text
+			}
+			const text = item.text
+			return text &&
+				typeof text === "object" &&
+				"content" in text &&
+				typeof text.content === "string"
+				? text.content
+				: ""
+		})
+		.join("")
+}
+
+function timestamp(
+	value: string | number | null | undefined,
+): NotionDataSourceValue | undefined {
+	if (value === undefined || value === null || value === "") {
+		return undefined
+	}
+	const date = new Date(value)
+	if (!Number.isFinite(date.getTime())) {
+		return undefined
+	}
+	return {
+		type: "datetime",
+		start_date: date.toISOString().slice(0, 10),
+		start_time: date.toISOString().slice(11, 16),
+		time_zone: "UTC",
+	}
+}
+
+function legacyDate(value: {
+	start: string
+	end?: string | null
+	time_zone?: string | null
+}): NotionDataSourceValue {
+	const timed = value.start.includes("T") || value.time_zone != null
+	const offset = value.start.match(/([+-])(\d{2}):(\d{2})$/)
+	const offsetMinutes = offset
+		? (Number(offset[2]) * 60 + Number(offset[3])) *
+			(offset[1] === "-" ? -1 : 1)
+		: 0
+	const parts = (input: string) => {
+		if (!input.includes("T")) {
+			return { date: input, time: "00:00" }
+		}
+		const wallClock = input.match(
+			/^(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2})(?::\d{2}(?:\.\d+)?)?$/,
+		)
+		if (wallClock) {
+			return { date: wallClock[1], time: wallClock[2] }
+		}
+		if (!value.time_zone) {
+			const local = new Date(
+				new Date(input).getTime() + offsetMinutes * 60_000,
+			).toISOString()
+			return { date: local.slice(0, 10), time: local.slice(11, 16) }
+		}
+		const entries = new Intl.DateTimeFormat("en-CA", {
+			timeZone: value.time_zone,
+			year: "numeric",
+			month: "2-digit",
+			day: "2-digit",
+			hour: "2-digit",
+			minute: "2-digit",
+			hourCycle: "h23",
+		}).formatToParts(new Date(input))
+		const get = (type: string) =>
+			entries.find(part => part.type === type)?.value
+		return {
+			date: `${get("year")}-${get("month")}-${get("day")}`,
+			time: `${get("hour")}:${get("minute")}`,
+		}
+	}
+	const start = parts(value.start)
+	const end = value.end ? parts(value.end) : undefined
+	if (!timed) {
+		return end
+			? { type: "daterange", start_date: start.date, end_date: end.date }
+			: { type: "date", start_date: start.date }
+	}
+	const zone =
+		value.time_zone ??
+		(offsetMinutes === 0
+			? "UTC"
+			: `UTC${offsetMinutes < 0 ? "-" : "+"}${Math.floor(Math.abs(offsetMinutes) / 60)}${Math.abs(offsetMinutes) % 60 === 0 ? "" : `:${String(Math.abs(offsetMinutes) % 60).padStart(2, "0")}`}`)
+	return end
+		? {
+				type: "datetimerange",
+				start_date: start.date,
+				start_time: start.time,
+				end_date: end.date,
+				end_time: end.time,
+				time_zone: zone,
+			}
+		: {
+				type: "datetime",
+				start_date: start.date,
+				start_time: start.time,
+				time_zone: zone,
+			}
+}
+
+function toLegacyProperty(
+	property: NotionPagePropertyValue,
+): NotionDataSourceValue | undefined {
+	switch (property.type) {
+		case "title":
+			return plainText(property.title)
+		case "rich_text":
+			return plainText(property.rich_text)
+		case "number":
+			return property.number ?? undefined
+		case "checkbox":
+			return property.checkbox
+		case "url":
+			return property.url ?? ""
+		case "email":
+			return property.email ?? ""
+		case "phone_number":
+			return property.phone_number ?? ""
+		case "select":
+			return property.select?.name
+		case "status":
+			return property.status?.name
+		case "multi_select":
+			return property.multi_select.flatMap(option => option.name ?? [])
+		case "date":
+			return property.date ? legacyDate(property.date) : undefined
+		case "people":
+			return property.people.map(person =>
+				person.object === "group"
+					? {
+							id: person.id,
+							table: "space_permission_group",
+							spaceId: person.id.split("|")[1],
+						}
+					: { id: person.id, table: "notion_user" },
+			)
+		case "relation":
+			return property.relation.map(page => ({ id: page.id, table: "block" }))
+		case "files":
+			return property.files.map(file => file.name).join(",")
+		case "place":
+			return ""
+		case "created_time":
+			return timestamp(property.created_time)
+		case "last_edited_time":
+			return timestamp(property.last_edited_time)
+		case "last_visited_time":
+			return timestamp(property.last_visited_time)
+		case "created_by":
+			return property.created_by ? [property.created_by] : undefined
+		case "last_edited_by":
+			return property.last_edited_by ? [property.last_edited_by] : undefined
+		default:
+			return unreachable(property)
+	}
+}

package/src/lifecycle/normalizeHostToSandboxMessage.ts

@@ -1,46 +1,18 @@
-import { NOTION_BUILTIN_PROPERTY_SCHEMAS } from "@notionhq/custom-blocks-protocol/dataSources/propertySchema.js"
-import type { HostToSandboxMessage } from "@notionhq/custom-blocks-protocol/messages/hostToSandbox.js"
+import type {
+	HostToSandboxMessage,
+	HostToSandboxMessageLegacy,
+} from "@notionhq/custom-blocks-protocol/messages/hostToSandbox.js"
+import { normalizeQueryPage } from "./normalizeQueryPage.js"
 
 /**
  * Normalizes an outgoing message for the bridge protocol version requested by the sandbox.
  */
 // TODO(custom-blocks): Remove this function when MIN_HOST_SUPPORTED_BRIDGE_PROTOCOL_VERSION
-// reaches 5.
+// reaches 6.
 export function normalizeHostToSandboxMessage(
 	message: HostToSandboxMessage,
 	bridgeProtocolVersion: number,
-): HostToSandboxMessage {
-	// The latest SDK version does not need any normalization.
-	if (bridgeProtocolVersion >= 5) {
-		return message
-	}
-	const containsDataSources =
-		(message.type === "init" && message.status === "success") ||
-		message.type === "dataSourcesChanged"
-	if (!containsDataSources) {
-		return message
-	}
-	// Protocol 5 excludes synthetic IDs such as created_time from collectionSchema.propertiesById.
-	// Older SDKs derive read schemas from that map. Restore those entries in outgoing copies so
-	// host query validation still uses the actual database schema.
-	return {
-		...message,
-		dataSources: {
-			bindings: Object.fromEntries(
-				Object.entries(message.dataSources.bindings).map(([key, binding]) => [
-					key,
-					{
-						...binding,
-						collectionSchema: {
-							...binding.collectionSchema,
-							propertiesById: {
-								...binding.collectionSchema?.propertiesById,
-								...NOTION_BUILTIN_PROPERTY_SCHEMAS,
-							},
-						},
-					},
-				]),
-			),
-		},
-	}
+): HostToSandboxMessageLegacy {
+	const normalizedMessage = normalizeQueryPage(message, bridgeProtocolVersion)
+	return normalizedMessage
 }

package/src/lifecycle/normalizeQueryPage.ts

@@ -0,0 +1,25 @@
+import type {
+	HostToSandboxMessage,
+	HostToSandboxMessageLegacy,
+} from "@notionhq/custom-blocks-protocol/messages/hostToSandbox.js"
+import { LEGACY_PROPERTY_SHAPE_PROTOCOL_VERSION } from "@notionhq/custom-blocks-protocol/protocolVersion.js"
+import { toLegacyQueryPage } from "./legacyPage.js"
+
+export function normalizeQueryPage(
+	message: HostToSandboxMessageLegacy | HostToSandboxMessage,
+	bridgeProtocolVersion: number,
+): HostToSandboxMessageLegacy {
+	if (
+		bridgeProtocolVersion < LEGACY_PROPERTY_SHAPE_PROTOCOL_VERSION &&
+		message.type === "queryDataSourceResult" &&
+		message.status === "success"
+	) {
+		return {
+			...message,
+			items: message.items.map(page =>
+				"properties" in page ? toLegacyQueryPage(page) : page,
+			),
+		}
+	}
+	return message
+}