@notionhq/custom-blocks-host 0.1.24 → 0.1.26

package/dist/protocol/pages/page.d.ts

@@ -8,7 +8,10 @@ import * as v from "valibot";
 /**
  * The custom block's nearest enclosing page ancestor, carried in `init.page` and `pageChanged`.
  */
-export declare const customBlockPageSchema: v.ObjectSchema<{
+export declare const customBlockPageSchema: 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">]>;
     /**
      * The containing page's own parent. It lets a block distinguish a freestanding page from a
@@ -33,7 +36,7 @@ export declare const customBlockPageSchema: v.ObjectSchema<{
     }, undefined>, v.ObjectSchema<{
         readonly type: v.LiteralSchema<"unavailable", undefined>;
     }, undefined>], undefined>;
-}, undefined>;
+}, undefined>], undefined>;
 export type CustomBlockPage = v.InferOutput<typeof customBlockPageSchema>;
 export declare const notionEmojiIconSchema: v.ObjectSchema<{
     readonly type: v.LiteralSchema<"emoji", undefined>;

package/dist/protocol/pages/page.js

@@ -10,15 +10,21 @@ import { notionParentSchema } from "../parent.js";
 /**
  * The custom block's nearest enclosing page ancestor, carried in `init.page` and `pageChanged`.
  */
-export const customBlockPageSchema = v.object({
-    id: notionPageIdSchema,
-    /**
-     * The containing page's own parent. It lets a block distinguish a freestanding page from a
-     * database row without a round trip. Not to be confused with the top-level `parent` runtime
-     * value, which is the custom block's own parent.
-     */
-    parent: notionParentSchema,
-});
+export const customBlockPageSchema = v.variant("type", [
+    /** The viewer cannot access the containing page; its ID and parent are not exposed. */
+    v.object({ type: v.literal("unavailable") }),
+    /** The viewer can access the containing page; includes its ID and parent location. */
+    v.object({
+        type: v.literal("page"),
+        id: notionPageIdSchema,
+        /**
+         * The containing page's own parent. It lets a block distinguish a freestanding page from a
+         * database row without a round trip. Not to be confused with the top-level `parent` runtime
+         * value, which is the custom block's own parent.
+         */
+        parent: notionParentSchema,
+    }),
+]);
 export const notionEmojiIconSchema = v.object({
     type: v.literal("emoji"),
     emoji: v.string(),

package/dist/protocol/protocolVersion.d.ts

@@ -3,4 +3,4 @@
  * Increase this value for breaking wire changes. Hosts can continue to accept
  * older versions, so this value does not set the minimum or maximum they accept.
  */
-export declare const LATEST_BRIDGE_PROTOCOL_VERSION = 4;
+export declare const LATEST_BRIDGE_PROTOCOL_VERSION = 5;

package/dist/protocol/protocolVersion.js

@@ -3,4 +3,4 @@
  * Increase this value for breaking wire changes. Hosts can continue to accept
  * older versions, so this value does not set the minimum or maximum they accept.
  */
-export const LATEST_BRIDGE_PROTOCOL_VERSION = 4;
+export const LATEST_BRIDGE_PROTOCOL_VERSION = 5;

package/dist/queries/validateQueryDataSourceFilter.d.ts

@@ -1,5 +1,5 @@
 import type { NotionCollectionSchema } from "../protocol/dataSources/dataSource.js";
 import type { ResolvedCustomBlockDataSourceFilter } from "../protocol/messages/queryDataSource.js";
 import type { CustomBlockQueryDataSourceErrorInfo } from "../protocol/messages/queryDataSourceResult.js";
-export declare function validateQueryDataSourceFilter(filter: ResolvedCustomBlockDataSourceFilter | undefined, collectionSchema: NotionCollectionSchema | undefined): CustomBlockQueryDataSourceErrorInfo | undefined;
+export declare function validateQueryDataSourceFilter(filter: ResolvedCustomBlockDataSourceFilter | undefined, collectionSchema: NotionCollectionSchema): CustomBlockQueryDataSourceErrorInfo | undefined;
 //# sourceMappingURL=validateQueryDataSourceFilter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"validateQueryDataSourceFilter.d.ts","sourceRoot":"","sources":["../../src/queries/validateQueryDataSourceFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4DAA4D,CAAA;AACxG,OAAO,KAAK,EAGX,mCAAmC,EAEnC,MAAM,8DAA8D,CAAA;AACrE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,oEAAoE,CAAA;AAO7H,wBAAgB,6BAA6B,CAC5C,MAAM,EAAE,mCAAmC,GAAG,SAAS,EACvD,gBAAgB,EAAE,sBAAsB,GAAG,SAAS,GAClD,mCAAmC,GAAG,SAAS,CAajD"}
+{"version":3,"file":"validateQueryDataSourceFilter.d.ts","sourceRoot":"","sources":["../../src/queries/validateQueryDataSourceFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4DAA4D,CAAA;AACxG,OAAO,KAAK,EAGX,mCAAmC,EAEnC,MAAM,8DAA8D,CAAA;AACrE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,oEAAoE,CAAA;AAO7H,wBAAgB,6BAA6B,CAC5C,MAAM,EAAE,mCAAmC,GAAG,SAAS,EACvD,gBAAgB,EAAE,sBAAsB,GACtC,mCAAmC,GAAG,SAAS,CAajD"}

package/dist/queries/validateQueryDataSourceFilter.js

@@ -1,6 +1,6 @@
 import { unreachable } from "../utils.js";
 export function validateQueryDataSourceFilter(filter, collectionSchema) {
-    if (filter === undefined || collectionSchema === undefined) {
+    if (filter === undefined) {
         return undefined;
     }
     const propertyFilters = "and" in filter ? filter.and : [filter];
@@ -13,14 +13,19 @@ export function validateQueryDataSourceFilter(filter, collectionSchema) {
     return undefined;
 }
 function validatePropertyFilter(filter, collectionSchema) {
-    const propertySchema = collectionSchema.propertiesById[filter.propertyId];
-    if (propertySchema === undefined) {
-        return undefined;
+    if (!Object.hasOwn(collectionSchema.propertiesById, filter.propertyId)) {
+        return {
+            code: "invalid_data_source_query_filter",
+            message: `Data source query filter property ID "${filter.propertyId}" is not defined in the bound data source schema.`,
+            isRetryable: false,
+        };
     }
-    if ("people" in filter && propertySchema.type !== "people") {
+    const propertySchema = collectionSchema.propertiesById[filter.propertyId];
+    const branch = Object.keys(filter).find(key => key !== "propertyId");
+    if (branch !== propertySchema.type) {
         return {
             code: "invalid_data_source_query_filter",
-            message: `Data source query filter branch "people" does not match property type "${propertySchema.type}".`,
+            message: `Data source query filter branch "${branch}" does not match property type "${propertySchema.type}".`,
             isRetryable: false,
         };
     }

package/dist/queries/validateQueryDataSourceSorts.d.ts

@@ -4,5 +4,5 @@ import type { CustomBlockQueryDataSourceErrorInfo } from "../protocol/messages/q
 /**
  * Ensures the sorts of a data source query are valid.
  */
-export declare function validateQueryDataSourceSorts(sorts: ResolvedCustomBlockDataSourceSort[] | undefined, collectionSchema: NotionCollectionSchema | undefined): CustomBlockQueryDataSourceErrorInfo | undefined;
+export declare function validateQueryDataSourceSorts(sorts: ResolvedCustomBlockDataSourceSort[] | undefined, collectionSchema: NotionCollectionSchema): CustomBlockQueryDataSourceErrorInfo | undefined;
 //# sourceMappingURL=validateQueryDataSourceSorts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"validateQueryDataSourceSorts.d.ts","sourceRoot":"","sources":["../../src/queries/validateQueryDataSourceSorts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4DAA4D,CAAA;AAExG,OAAO,EAEN,KAAK,iCAAiC,EACtC,MAAM,8DAA8D,CAAA;AACrE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,oEAAoE,CAAA;AAM7H;;GAEG;AACH,wBAAgB,4BAA4B,CAC3C,KAAK,EAAE,iCAAiC,EAAE,GAAG,SAAS,EACtD,gBAAgB,EAAE,sBAAsB,GAAG,SAAS,GAClD,mCAAmC,GAAG,SAAS,CA+CjD"}
+{"version":3,"file":"validateQueryDataSourceSorts.d.ts","sourceRoot":"","sources":["../../src/queries/validateQueryDataSourceSorts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4DAA4D,CAAA;AAExG,OAAO,EAEN,KAAK,iCAAiC,EACtC,MAAM,8DAA8D,CAAA;AACrE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,oEAAoE,CAAA;AAM7H;;GAEG;AACH,wBAAgB,4BAA4B,CAC3C,KAAK,EAAE,iCAAiC,EAAE,GAAG,SAAS,EACtD,gBAAgB,EAAE,sBAAsB,GACtC,mCAAmC,GAAG,SAAS,CAyCjD"}

package/dist/queries/validateQueryDataSourceSorts.js

@@ -25,17 +25,15 @@ export function validateQueryDataSourceSorts(sorts, collectionSchema) {
             };
         }
         seenPropertyIds.add(sort.propertyId);
-        if (collectionSchema !== undefined &&
-            !Object.hasOwn(collectionSchema.propertiesById, sort.propertyId)) {
+        if (!Object.hasOwn(collectionSchema.propertiesById, sort.propertyId)) {
             return {
                 code: "invalid_data_source_query_sort",
                 message: `Data source query sort property ID "${sort.propertyId}" is not defined in the bound data source schema.`,
                 isRetryable: false,
             };
         }
-        const propertySchema = collectionSchema?.propertiesById[sort.propertyId];
-        if (propertySchema !== undefined &&
-            !supportedDataSourceSortPropertyTypes.has(propertySchema.type)) {
+        const propertySchema = collectionSchema.propertiesById[sort.propertyId];
+        if (!supportedDataSourceSortPropertyTypes.has(propertySchema.type)) {
             return {
                 code: "invalid_data_source_query_sort",
                 message: `Data source query sorts do not yet support property type "${propertySchema.type}".`,

package/package.json

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

package/src/createCustomBlockHost.ts

@@ -2,6 +2,7 @@ import {
 	DEFAULT_CONTRAST_MODE,
 	type NotionContrastMode,
 } from "@notionhq/custom-blocks-protocol/contrast.js"
+import type { NotionCollectionSchema } from "@notionhq/custom-blocks-protocol/dataSources/dataSource.js"
 import type { NotionDataSourceId } from "@notionhq/custom-blocks-protocol/ids.js"
 import type { CustomBlockManifest } from "@notionhq/custom-blocks-protocol/manifest.js"
 import type { ContrastModeChangedMessage } from "@notionhq/custom-blocks-protocol/messages/contrastModeChanged.js"
@@ -29,16 +30,21 @@ import type {
 import type { PageChangedMessage } from "@notionhq/custom-blocks-protocol/messages/pageChanged.js"
 import type { ParentChangedMessage } from "@notionhq/custom-blocks-protocol/messages/parentChanged.js"
 import type { QueryDataSourceMessage } from "@notionhq/custom-blocks-protocol/messages/queryDataSource.js"
-import type { QueryDataSourceResultMessage } from "@notionhq/custom-blocks-protocol/messages/queryDataSourceResult.js"
+import type {
+	CustomBlockQueryDataSourceErrorInfo,
+	QueryDataSourceResultMessage,
+} from "@notionhq/custom-blocks-protocol/messages/queryDataSourceResult.js"
 import type { ThemeChangedMessage } from "@notionhq/custom-blocks-protocol/messages/themeChanged.js"
 import type { UpdatePageMessage } from "@notionhq/custom-blocks-protocol/messages/updatePage.js"
 import type { UpdatePageResultMessage } from "@notionhq/custom-blocks-protocol/messages/updatePageResult.js"
 import type { CustomBlockPage } from "@notionhq/custom-blocks-protocol/pages/page.js"
 import type { NotionParent } 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 { initErrorForFailureReason } from "./lifecycle/initErrors.js"
 import { createInitializationController } from "./lifecycle/initializationController.js"
+import { normalizeHostToSandboxMessage } from "./lifecycle/normalizeHostToSandboxMessage.js"
 import type {
 	CustomBlockHostDataSourcesPayload,
 	CustomBlockHostInitialState,
@@ -62,16 +68,19 @@ export type CustomBlockHostOptions = {
 	iframe: HTMLIFrameElement
 	sandboxOrigin: string
 	/**
-	 * Minimum sandbox protocol version to accept. Defaults to the host runtime
-	 * minimum. Higher values retire older SDKs; lower values cannot enable
-	 * protocol versions the runtime no longer supports.
+	 * Minimum sandbox protocol version to accept. Defaults to the host runtime minimum. Higher
+	 * values retire older SDKs; lower values cannot enable protocol versions the runtime no longer
+	 * supports.
 	 */
 	minBridgeProtocolVersion?: number
 	noConnectTimeoutMs?: number
 	noInitResultTimeoutMs?: number
 	initialState: CustomBlockHostInitialState
 	handlers: CustomBlockHostHandlers
-	/** Called as soon as the `manifest` is available after `connect`, before `onInitialized` and binding validation. */
+	/**
+	 * Called as soon as the `manifest` is available after `connect`, before `onInitialized` and
+	 * binding validation.
+	 */
 	onManifest?: (manifest: CustomBlockManifest) => void
 	/** Callback fired when the initialization handshake with the sandbox completed successfully. */
 	onInitialized?: (state: {
@@ -83,8 +92,7 @@ export type CustomBlockHostOptions = {
 		error: CustomBlockHostInitializationFailure,
 	) => void
 	/**
-	 * Callback fired when the current host and iframe must restart.
-	 * Recreate both to continue.
+	 * Callback fired when the current host and iframe must restart. Recreate both to continue.
 	 */
 	onRestartRequired?: () => void
 	onLog?: (direction: CustomBlockHostLogDirection, payload: unknown) => void
@@ -119,8 +127,8 @@ export function createCustomBlockHost(
 		noConnectTimeoutMs,
 		noInitResultTimeoutMs,
 	} = options
-	// Callers can retire older SDKs, but cannot restore support for protocols
-	// the runtime no longer implements. Omission uses the runtime minimum.
+	// Callers can retire older SDKs, but cannot restore support for protocols the runtime no longer
+	// implements. Omission uses the runtime minimum.
 	const minBridgeProtocolVersion = Math.max(
 		configuredMinBridgeProtocolVersion ??
 			MIN_HOST_SUPPORTED_BRIDGE_PROTOCOL_VERSION,
@@ -133,6 +141,7 @@ export function createCustomBlockHost(
 	let page = initialState.page
 	let dataSources = initialState.dataSources
 	let activeDataSources: CustomBlockHostDataSourcesPayload | undefined
+	let sandboxBridgeProtocolVersion = LATEST_BRIDGE_PROTOCOL_VERSION
 	let manifest = initialState.manifest
 	let currentUser = initialState.currentUser
 	let pendingThemeChange = false
@@ -148,8 +157,12 @@ export function createCustomBlockHost(
 	}
 
 	function post(message: HostToSandboxMessage) {
-		emit("out", message)
-		iframe.contentWindow?.postMessage(message, sandboxOrigin)
+		const sandboxMessage = normalizeHostToSandboxMessage(
+			message,
+			sandboxBridgeProtocolVersion,
+		)
+		emit("out", sandboxMessage)
+		iframe.contentWindow?.postMessage(sandboxMessage, sandboxOrigin)
 	}
 
 	function postQueryDataSourceResult(args: {
@@ -182,28 +195,12 @@ export function createCustomBlockHost(
 			activeDataSources,
 			message.dataSourceId,
 		)
-		const filterError = validateQueryDataSourceFilter(
-			message.filter,
-			collectionSchema,
-		)
-		if (filterError !== undefined) {
+		const queryError = getQueryValidationError(message, collectionSchema)
+		if (queryError !== undefined) {
 			if (querySubscriptions.isCurrent(message.subscriptionId, token)) {
 				postQueryDataSourceResult({
 					subscriptionId: message.subscriptionId,
-					response: { status: "error", error: filterError },
-				})
-			}
-			return
-		}
-		const sortError = validateQueryDataSourceSorts(
-			message.sorts,
-			collectionSchema,
-		)
-		if (sortError !== undefined) {
-			if (querySubscriptions.isCurrent(message.subscriptionId, token)) {
-				postQueryDataSourceResult({
-					subscriptionId: message.subscriptionId,
-					response: { status: "error", error: sortError },
+					response: { status: "error", error: queryError },
 				})
 			}
 			return
@@ -321,7 +318,10 @@ export function createCustomBlockHost(
 		if (pendingDataSourcesChange !== undefined) {
 			const nextDataSources = pendingDataSourcesChange
 			pendingDataSourcesChange = undefined
-			post({ type: "dataSourcesChanged", dataSources: nextDataSources })
+			post({
+				type: "dataSourcesChanged",
+				dataSources: nextDataSources,
+			})
 		}
 		if (pendingCurrentUserChange) {
 			pendingCurrentUserChange = false
@@ -339,6 +339,7 @@ export function createCustomBlockHost(
 			currentUser,
 		}),
 		prepareInit(connect) {
+			sandboxBridgeProtocolVersion = connect.bridgeProtocolVersion
 			manifest = connect.manifest ?? initialState.manifest
 			if (manifest === undefined) {
 				return {
@@ -553,3 +554,25 @@ function getBindingErrorCode(
 	}
 	return undefined
 }
+
+function getQueryValidationError(
+	message: QueryDataSourceMessage,
+	collectionSchema: NotionCollectionSchema | undefined,
+): CustomBlockQueryDataSourceErrorInfo | undefined {
+	// The host can omit the database schema. Queries without filters or sorts need no schema validation.
+	if (collectionSchema === undefined) {
+		if (message.filter === undefined && (message.sorts?.length ?? 0) === 0) {
+			return undefined
+		}
+		return {
+			code: "data_source_schema_unavailable",
+			message:
+				"You cannot query this data source with filters or sorts because its schema is unavailable.",
+			isRetryable: false,
+		}
+	}
+	return (
+		validateQueryDataSourceFilter(message.filter, collectionSchema) ??
+		validateQueryDataSourceSorts(message.sorts, collectionSchema)
+	)
+}

package/src/lifecycle/normalizeHostToSandboxMessage.ts

@@ -0,0 +1,46 @@
+import { NOTION_BUILTIN_PROPERTY_SCHEMAS } from "@notionhq/custom-blocks-protocol/dataSources/propertySchema.js"
+import type { HostToSandboxMessage } from "@notionhq/custom-blocks-protocol/messages/hostToSandbox.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.
+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,
+							},
+						},
+					},
+				]),
+			),
+		},
+	}
+}

package/src/queries/validateQueryDataSourceFilter.ts

@@ -14,9 +14,9 @@ type OptionFilterOperator =
 
 export function validateQueryDataSourceFilter(
 	filter: ResolvedCustomBlockDataSourceFilter | undefined,
-	collectionSchema: NotionCollectionSchema | undefined,
+	collectionSchema: NotionCollectionSchema,
 ): CustomBlockQueryDataSourceErrorInfo | undefined {
-	if (filter === undefined || collectionSchema === undefined) {
+	if (filter === undefined) {
 		return undefined
 	}
 
@@ -34,15 +34,20 @@ function validatePropertyFilter(
 	filter: ResolvedCustomBlockDataSourcePropertyFilter,
 	collectionSchema: NotionCollectionSchema,
 ): CustomBlockQueryDataSourceErrorInfo | undefined {
-	const propertySchema = collectionSchema.propertiesById[filter.propertyId]
-	if (propertySchema === undefined) {
-		return undefined
+	if (!Object.hasOwn(collectionSchema.propertiesById, filter.propertyId)) {
+		return {
+			code: "invalid_data_source_query_filter",
+			message: `Data source query filter property ID "${filter.propertyId}" is not defined in the bound data source schema.`,
+			isRetryable: false,
+		}
 	}
+	const propertySchema = collectionSchema.propertiesById[filter.propertyId]
 
-	if ("people" in filter && propertySchema.type !== "people") {
+	const branch = Object.keys(filter).find(key => key !== "propertyId")
+	if (branch !== propertySchema.type) {
 		return {
 			code: "invalid_data_source_query_filter",
-			message: `Data source query filter branch "people" does not match property type "${propertySchema.type}".`,
+			message: `Data source query filter branch "${branch}" does not match property type "${propertySchema.type}".`,
 			isRetryable: false,
 		}
 	}

package/src/queries/validateQueryDataSourceSorts.ts

@@ -15,7 +15,7 @@ const supportedDataSourceSortPropertyTypes = new Set<string>(
  */
 export function validateQueryDataSourceSorts(
 	sorts: ResolvedCustomBlockDataSourceSort[] | undefined,
-	collectionSchema: NotionCollectionSchema | undefined,
+	collectionSchema: NotionCollectionSchema,
 ): CustomBlockQueryDataSourceErrorInfo | undefined {
 	if (sorts === undefined) {
 		return undefined
@@ -39,10 +39,7 @@ export function validateQueryDataSourceSorts(
 		}
 		seenPropertyIds.add(sort.propertyId)
 
-		if (
-			collectionSchema !== undefined &&
-			!Object.hasOwn(collectionSchema.propertiesById, sort.propertyId)
-		) {
+		if (!Object.hasOwn(collectionSchema.propertiesById, sort.propertyId)) {
 			return {
 				code: "invalid_data_source_query_sort",
 				message: `Data source query sort property ID "${sort.propertyId}" is not defined in the bound data source schema.`,
@@ -50,11 +47,8 @@ export function validateQueryDataSourceSorts(
 			}
 		}
 
-		const propertySchema = collectionSchema?.propertiesById[sort.propertyId]
-		if (
-			propertySchema !== undefined &&
-			!supportedDataSourceSortPropertyTypes.has(propertySchema.type)
-		) {
+		const propertySchema = collectionSchema.propertiesById[sort.propertyId]
+		if (!supportedDataSourceSortPropertyTypes.has(propertySchema.type)) {
 			return {
 				code: "invalid_data_source_query_sort",
 				message: `Data source query sorts do not yet support property type "${propertySchema.type}".`,