@notionhq/custom-blocks 0.1.34 → 0.1.35

package/dist/bridge/SandboxBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SandboxBridge.d.ts","sourceRoot":"","sources":["../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/bridge/SandboxBridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SandboxBridge.d.ts","sourceRoot":"","sources":["../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/bridge/SandboxBridge.ts"],"names":[],"mappings":"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"}

package/dist/bridge/SandboxBridge.js

@@ -580,6 +580,7 @@ export class SandboxBridge {
             dataSourceId: query.dataSourceId,
             limit: query.limit,
             ...(query.filter !== undefined ? { filter: query.filter } : {}),
+            ...(query.sorts !== undefined ? { sorts: query.sorts } : {}),
         };
         this.postToHost(outbound);
     }

package/dist/bridge/dataSources/query.d.ts

@@ -1,11 +1,12 @@
 import type { NotionDataSource } from "../../protocol/dataSources/dataSource.js";
 import type { NotionDataSourceId } from "../../protocol/ids.js";
-import { type ResolvedCustomBlockDataSourceFilter } from "../../protocol/messages/queryDataSource.js";
+import { type ResolvedCustomBlockDataSourceFilter, type ResolvedCustomBlockDataSourceSort } from "../../protocol/messages/queryDataSource.js";
 import type { UseDataSourceOptions } from "../../types.js";
 export type ResolvedDataSourceQuery = {
     dataSourceId: NotionDataSourceId;
     limit: number;
     filter?: ResolvedCustomBlockDataSourceFilter;
+    sorts?: ResolvedCustomBlockDataSourceSort[];
     identity: string;
 };
 export type ResolveDataSourceQueryResult = {

package/dist/bridge/dataSources/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/bridge/dataSources/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4DAA4D,CAAA;AAClG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AACjF,OAAO,EAON,KAAK,mCAAmC,EAExC,MAAM,8DAA8D,CAAA;AAErE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAM1D,MAAM,MAAM,uBAAuB,GAAG;IACrC,YAAY,EAAE,kBAAkB,CAAA;IAChC,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,mCAAmC,CAAA;IAC5C,QAAQ,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,4BAA4B,GACrC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAClC;IACA,MAAM,EAAE,IAAI,CAAA;IACZ,UAAU,EAAE,gBAAgB,CAAA;IAC5B,KAAK,EAAE,uBAAuB,CAAA;CAC7B,CAAA;AAEJ,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC5C,WAAW,EAAE,gBAAgB,EAAE,CAAA;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAChC,GAAG,4BAA4B,CAuD/B;AA6BD,wBAAgB,iCAAiC,CAChD,OAAO,EAAE,oBAAoB,GAAG,SAAS,GACvC,MAAM,CAMR"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/bridge/dataSources/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4DAA4D,CAAA;AAElG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AACjF,OAAO,EAQN,KAAK,mCAAmC,EAExC,KAAK,iCAAiC,EACtC,MAAM,8DAA8D,CAAA;AAErE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAU1D,MAAM,MAAM,uBAAuB,GAAG;IACrC,YAAY,EAAE,kBAAkB,CAAA;IAChC,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,mCAAmC,CAAA;IAC5C,KAAK,CAAC,EAAE,iCAAiC,EAAE,CAAA;IAC3C,QAAQ,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,4BAA4B,GACrC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAClC;IACA,MAAM,EAAE,IAAI,CAAA;IACZ,UAAU,EAAE,gBAAgB,CAAA;IAC5B,KAAK,EAAE,uBAAuB,CAAA;CAC7B,CAAA;AAYJ,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC5C,WAAW,EAAE,gBAAgB,EAAE,CAAA;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAChC,GAAG,4BAA4B,CAmD/B;AAiFD,wBAAgB,iCAAiC,CAChD,OAAO,EAAE,oBAAoB,GAAG,SAAS,GACvC,MAAM,CAMR"}

package/dist/bridge/dataSources/query.js

@@ -1,23 +1,18 @@
-import { customBlockCheckboxFilterOperatorSchema, customBlockContainsFilterOperatorSchema, customBlockDateFilterOperatorSchema, customBlockNumberFilterOperatorSchema, customBlockOptionFilterOperatorSchema, customBlockTextFilterOperatorSchema, } from "../../protocol/messages/queryDataSource.js";
+import { CUSTOM_BLOCK_DATA_SOURCE_SORTABLE_PROPERTY_TYPES } from "../../protocol/dataSources/propertySchema.js";
+import { CUSTOM_BLOCK_DATA_SOURCE_QUERY_MAX_SORTS, customBlockCheckboxFilterOperatorSchema, customBlockContainsFilterOperatorSchema, customBlockDateFilterOperatorSchema, customBlockNumberFilterOperatorSchema, customBlockOptionFilterOperatorSchema, customBlockTextFilterOperatorSchema, } from "../../protocol/messages/queryDataSource.js";
 import * as v from "valibot";
+import { unreachable } from "../../utils.js";
 const DEFAULT_DATA_SOURCE_QUERY_LIMIT = 20;
 const MAX_DATA_SOURCE_QUERY_LIMIT = 999;
 const MAX_DATA_SOURCE_QUERY_FILTER_CHILDREN = 25;
+const supportedDataSourceSortPropertyTypes = new Set(CUSTOM_BLOCK_DATA_SOURCE_SORTABLE_PROPERTY_TYPES);
 export function resolveDataSourceQuery(args) {
     const { dataSources, key, options, warn } = args;
-    if (options !== undefined && !isPlainRecord(options)) {
-        return {
-            status: "error",
-            error: "Data source query options must be an object.",
-        };
-    }
-    if (options !== undefined &&
-        Object.keys(options).some(key => !["limit", "filter"].includes(key))) {
-        return {
-            status: "error",
-            error: "Data source query options contain unsupported fields.",
-        };
+    const resolvedOptions = resolveDataSourceQueryOptions(options);
+    if (resolvedOptions.status === "error") {
+        return resolvedOptions;
     }
+    const queryOptions = resolvedOptions.options;
     const dataSource = dataSources.find(entry => entry.key === key);
     if (dataSource === undefined) {
         return {
@@ -31,18 +26,23 @@ export function resolveDataSourceQuery(args) {
             error: `Data source "${key}" has not been mapped to a database yet.`,
         };
     }
-    const limit = resolveDataSourceQueryLimit(options?.limit, warn);
+    const limit = resolveDataSourceQueryLimit(queryOptions?.limit, warn);
     if (limit.status === "error") {
         return limit;
     }
-    const filter = resolveFilter(options?.filter, dataSource);
+    const filter = resolveFilter(queryOptions?.filter, dataSource);
     if (filter.status === "error") {
         return filter;
     }
+    const sorts = resolveSorts(queryOptions?.sorts, dataSource);
+    if (sorts.status === "error") {
+        return sorts;
+    }
     const identity = stableJsonStringify({
         dataSourceId: dataSource.collectionPointer.id,
         limit: limit.limit,
         filter: filter.filter ?? null,
+        sorts: sorts.sorts ?? [],
     });
     return {
         status: "ok",
@@ -51,10 +51,52 @@ export function resolveDataSourceQuery(args) {
             dataSourceId: dataSource.collectionPointer.id,
             limit: limit.limit,
             filter: filter.filter,
+            sorts: sorts.sorts,
             identity,
         },
     };
 }
+function resolveDataSourceQueryOptions(options) {
+    if (options === undefined) {
+        return { status: "ok" };
+    }
+    if (typeof options !== "object" ||
+        options === null ||
+        Array.isArray(options)) {
+        return {
+            status: "error",
+            error: "Data source query options must be an object.",
+        };
+    }
+    const prototype = Object.getPrototypeOf(options);
+    if (prototype !== Object.prototype && prototype !== null) {
+        return {
+            status: "error",
+            error: "Data source query options must be an object.",
+        };
+    }
+    const optionsObject = options;
+    if (Object.keys(optionsObject).some(key => !["limit", "filter", "sorts"].includes(key))) {
+        return {
+            status: "error",
+            error: "Data source query options contain unsupported fields.",
+        };
+    }
+    return {
+        status: "ok",
+        options: {
+            limit: Object.prototype.hasOwnProperty.call(optionsObject, "limit")
+                ? optionsObject.limit
+                : undefined,
+            filter: Object.prototype.hasOwnProperty.call(optionsObject, "filter")
+                ? optionsObject.filter
+                : undefined,
+            sorts: Object.prototype.hasOwnProperty.call(optionsObject, "sorts")
+                ? optionsObject.sorts
+                : undefined,
+        },
+    };
+}
 function resolveDataSourceQueryLimit(limit, warn = console.warn) {
     if (limit === undefined) {
         return { status: "ok", limit: DEFAULT_DATA_SOURCE_QUERY_LIMIT };
@@ -89,27 +131,29 @@ function resolveFilter(filter, dataSource) {
     if (filter === undefined) {
         return { status: "ok" };
     }
-    if (!isPlainRecord(filter)) {
+    if (typeof filter !== "object" || filter === null || Array.isArray(filter)) {
         return {
             status: "error",
             error: "Data source query filter must be an object.",
         };
     }
-    if ("and" in filter) {
-        if (Object.keys(filter).length !== 1 || !Array.isArray(filter.and)) {
+    const filterObject = filter;
+    if (Object.prototype.hasOwnProperty.call(filterObject, "and")) {
+        if (Object.keys(filterObject).length !== 1 ||
+            !Array.isArray(filterObject.and)) {
             return {
                 status: "error",
                 error: 'Data source query filter "and" must be an array.',
             };
         }
-        if (filter.and.length > MAX_DATA_SOURCE_QUERY_FILTER_CHILDREN) {
+        if (filterObject.and.length > MAX_DATA_SOURCE_QUERY_FILTER_CHILDREN) {
             return {
                 status: "error",
                 error: `Data source query filter "and" may contain at most ${MAX_DATA_SOURCE_QUERY_FILTER_CHILDREN} children.`,
             };
         }
         const and = [];
-        for (const child of filter.and) {
+        for (const child of filterObject.and) {
             const resolved = resolvePropertyFilter(child, dataSource);
             if (resolved.status === "error") {
                 return resolved;
@@ -118,20 +162,95 @@ function resolveFilter(filter, dataSource) {
         }
         return { status: "ok", filter: { and } };
     }
-    return resolvePropertyFilter(filter, dataSource);
+    return resolvePropertyFilter(filterObject, dataSource);
+}
+function resolveSorts(sorts, dataSource) {
+    if (sorts === undefined) {
+        return { status: "ok" };
+    }
+    if (!Array.isArray(sorts)) {
+        return {
+            status: "error",
+            error: "Data source query sorts must be an array.",
+        };
+    }
+    if (sorts.length === 0) {
+        return { status: "ok" };
+    }
+    if (sorts.length > CUSTOM_BLOCK_DATA_SOURCE_QUERY_MAX_SORTS) {
+        return {
+            status: "error",
+            error: `Data source query sorts may contain at most ${CUSTOM_BLOCK_DATA_SOURCE_QUERY_MAX_SORTS} entries.`,
+        };
+    }
+    const resolvedSorts = [];
+    const seenPropertyIds = new Set();
+    for (const sort of sorts) {
+        const resolved = resolveSort(sort, dataSource);
+        if (resolved.status === "error") {
+            return resolved;
+        }
+        if (seenPropertyIds.has(resolved.sort.propertyId)) {
+            return {
+                status: "error",
+                error: `Data source query sorts cannot contain duplicate property ID "${resolved.sort.propertyId}".`,
+            };
+        }
+        seenPropertyIds.add(resolved.sort.propertyId);
+        resolvedSorts.push(resolved.sort);
+    }
+    return { status: "ok", sorts: resolvedSorts };
+}
+function resolveSort(sort, dataSource) {
+    if (typeof sort !== "object" || sort === null || Array.isArray(sort)) {
+        return {
+            status: "error",
+            error: "Data source query sort must be an object.",
+        };
+    }
+    const sortObject = sort;
+    if (Object.keys(sortObject).some(key => !["key", "propertyId", "direction"].includes(key))) {
+        return {
+            status: "error",
+            error: "Data source query sort contains unsupported fields.",
+        };
+    }
+    const property = resolvePropertyAddress(sortObject, dataSource);
+    if (property.status === "error") {
+        return property;
+    }
+    if (!supportedDataSourceSortPropertyTypes.has(property.propertyType)) {
+        return {
+            status: "error",
+            error: `Data source query sorts do not yet support property type "${property.propertyType}".`,
+        };
+    }
+    const direction = sortObject.direction;
+    if (!Object.prototype.hasOwnProperty.call(sortObject, "direction") ||
+        (direction !== "ascending" && direction !== "descending")) {
+        return {
+            status: "error",
+            error: 'Data source query sort direction must be "ascending" or "descending".',
+        };
+    }
+    return {
+        status: "ok",
+        sort: { propertyId: property.propertyId, direction },
+    };
 }
 function resolvePropertyFilter(filter, dataSource) {
-    if (!isPlainRecord(filter)) {
+    if (typeof filter !== "object" || filter === null || Array.isArray(filter)) {
         return {
             status: "error",
             error: "Data source query property filter must be an object.",
         };
     }
-    const property = resolvePropertyAddress(filter, dataSource);
+    const filterObject = filter;
+    const property = resolvePropertyAddress(filterObject, dataSource);
     if (property.status === "error") {
         return property;
     }
-    const branchKeys = Object.keys(filter).filter(key => key !== "key" && key !== "propertyId");
+    const branchKeys = Object.keys(filterObject).filter(key => key !== "key" && key !== "propertyId");
     if (branchKeys.length !== 1) {
         return {
             status: "error",
@@ -139,8 +258,11 @@ function resolvePropertyFilter(filter, dataSource) {
         };
     }
     const branch = branchKeys[0];
-    const value = filter[branch];
-    if (!isPlainRecord(value) || Object.keys(value).length !== 1) {
+    const value = filterObject[branch];
+    if (typeof value !== "object" ||
+        value === null ||
+        Array.isArray(value) ||
+        Object.keys(value).length !== 1) {
         return invalidOperator(branch);
     }
     if (property.propertyType !== branch) {
@@ -149,133 +271,142 @@ function resolvePropertyFilter(filter, dataSource) {
             error: `Data source query filter branch "${branch}" does not match property type "${property.propertyType}".`,
         };
     }
-    switch (branch) {
-        case "title": {
-            const parsed = v.safeParse(customBlockTextFilterOperatorSchema, value);
-            return parsed.success
-                ? {
-                    status: "ok",
-                    filter: { propertyId: property.propertyId, title: parsed.output },
-                }
-                : invalidOperator(branch);
-        }
-        case "rich_text": {
-            const parsed = v.safeParse(customBlockTextFilterOperatorSchema, value);
-            return parsed.success
-                ? {
-                    status: "ok",
-                    filter: {
-                        propertyId: property.propertyId,
-                        rich_text: parsed.output,
-                    },
-                }
-                : invalidOperator(branch);
-        }
+    return resolvePropertyFilterBranch({
+        propertyId: property.propertyId,
+        branch,
+        value: value,
+    });
+}
+function resolvePropertyFilterBranch(args) {
+    switch (args.branch) {
+        case "title":
+        case "rich_text":
         case "url":
         case "email":
-        case "phone_number": {
-            const parsed = v.safeParse(customBlockTextFilterOperatorSchema, value);
-            if (!parsed.success) {
-                return invalidOperator(branch);
-            }
-            if (branch === "url") {
-                return {
-                    status: "ok",
-                    filter: { propertyId: property.propertyId, url: parsed.output },
-                };
-            }
-            if (branch === "email") {
-                return {
-                    status: "ok",
-                    filter: { propertyId: property.propertyId, email: parsed.output },
-                };
-            }
+        case "phone_number":
+            return resolveTextPropertyFilter({
+                propertyId: args.propertyId,
+                branch: args.branch,
+                value: args.value,
+            });
+        case "number":
+            return resolveNumberPropertyFilter(args.propertyId, args.value);
+        case "checkbox":
+            return resolveCheckboxPropertyFilter(args.propertyId, args.value);
+        case "select":
+        case "status":
+            return resolveOptionPropertyFilter({
+                propertyId: args.propertyId,
+                branch: args.branch,
+                value: args.value,
+            });
+        case "multi_select":
+            return resolveMultiSelectPropertyFilter(args.propertyId, args.value);
+        case "date":
+            return resolveDatePropertyFilter(args.propertyId, args.value);
+        default:
+            return {
+                status: "error",
+                error: `Data source query filter branch "${args.branch}" is not supported.`,
+            };
+    }
+}
+function resolveTextPropertyFilter(args) {
+    const parsed = v.safeParse(customBlockTextFilterOperatorSchema, args.value);
+    if (!parsed.success) {
+        return invalidOperator(args.branch);
+    }
+    switch (args.branch) {
+        case "title":
             return {
                 status: "ok",
-                filter: {
-                    propertyId: property.propertyId,
-                    phone_number: parsed.output,
-                },
+                filter: { propertyId: args.propertyId, title: parsed.output },
+            };
+        case "rich_text":
+            return {
+                status: "ok",
+                filter: { propertyId: args.propertyId, rich_text: parsed.output },
+            };
+        case "url":
+            return {
+                status: "ok",
+                filter: { propertyId: args.propertyId, url: parsed.output },
+            };
+        case "email":
+            return {
+                status: "ok",
+                filter: { propertyId: args.propertyId, email: parsed.output },
+            };
+        case "phone_number":
+            return {
+                status: "ok",
+                filter: { propertyId: args.propertyId, phone_number: parsed.output },
             };
-        }
-        case "number": {
-            const parsed = v.safeParse(customBlockNumberFilterOperatorSchema, value);
-            if (parsed.success &&
-                Object.values(parsed.output).every(entry => typeof entry !== "number" || Number.isFinite(entry))) {
-                return {
-                    status: "ok",
-                    filter: { propertyId: property.propertyId, number: parsed.output },
-                };
-            }
-            return invalidOperator(branch);
-        }
-        case "checkbox": {
-            const parsed = v.safeParse(customBlockCheckboxFilterOperatorSchema, value);
-            return parsed.success
-                ? {
-                    status: "ok",
-                    filter: {
-                        propertyId: property.propertyId,
-                        checkbox: parsed.output,
-                    },
-                }
-                : invalidOperator(branch);
-        }
-        case "select": {
-            const parsed = v.safeParse(customBlockOptionFilterOperatorSchema, value);
-            return parsed.success
-                ? {
-                    status: "ok",
-                    filter: { propertyId: property.propertyId, select: parsed.output },
-                }
-                : invalidOperator(branch);
-        }
-        case "multi_select": {
-            const parsed = v.safeParse(customBlockContainsFilterOperatorSchema, value);
-            return parsed.success
-                ? {
-                    status: "ok",
-                    filter: {
-                        propertyId: property.propertyId,
-                        multi_select: parsed.output,
-                    },
-                }
-                : invalidOperator(branch);
-        }
-        case "status": {
-            const parsed = v.safeParse(customBlockOptionFilterOperatorSchema, value);
-            return parsed.success
-                ? {
-                    status: "ok",
-                    filter: { propertyId: property.propertyId, status: parsed.output },
-                }
-                : invalidOperator(branch);
-        }
-        case "date": {
-            const parsed = v.safeParse(customBlockDateFilterOperatorSchema, value);
-            if (parsed.success &&
-                Object.values(parsed.output).every(entry => entry === true || isValidIsoDate(entry))) {
-                return {
-                    status: "ok",
-                    filter: { propertyId: property.propertyId, date: parsed.output },
-                };
-            }
-            return invalidOperator(branch);
-        }
         default:
+            return unreachable(args.branch);
+    }
+}
+function resolveNumberPropertyFilter(propertyId, value) {
+    const parsed = v.safeParse(customBlockNumberFilterOperatorSchema, value);
+    if (!parsed.success ||
+        !Object.values(parsed.output).every(entry => typeof entry !== "number" || Number.isFinite(entry))) {
+        return invalidOperator("number");
+    }
+    return {
+        status: "ok",
+        filter: { propertyId, number: parsed.output },
+    };
+}
+function resolveCheckboxPropertyFilter(propertyId, value) {
+    const parsed = v.safeParse(customBlockCheckboxFilterOperatorSchema, value);
+    return parsed.success
+        ? { status: "ok", filter: { propertyId, checkbox: parsed.output } }
+        : invalidOperator("checkbox");
+}
+function resolveOptionPropertyFilter(args) {
+    const parsed = v.safeParse(customBlockOptionFilterOperatorSchema, args.value);
+    if (!parsed.success) {
+        return invalidOperator(args.branch);
+    }
+    switch (args.branch) {
+        case "select":
             return {
-                status: "error",
-                error: `Data source query filter branch "${branch}" is not supported.`,
+                status: "ok",
+                filter: { propertyId: args.propertyId, select: parsed.output },
             };
+        case "status":
+            return {
+                status: "ok",
+                filter: { propertyId: args.propertyId, status: parsed.output },
+            };
+        default:
+            return unreachable(args.branch);
     }
 }
+function resolveMultiSelectPropertyFilter(propertyId, value) {
+    const parsed = v.safeParse(customBlockContainsFilterOperatorSchema, value);
+    return parsed.success
+        ? { status: "ok", filter: { propertyId, multi_select: parsed.output } }
+        : invalidOperator("multi_select");
+}
+function resolveDatePropertyFilter(propertyId, value) {
+    const parsed = v.safeParse(customBlockDateFilterOperatorSchema, value);
+    if (!parsed.success ||
+        !Object.values(parsed.output).every(entry => entry === true || isValidIsoDate(entry))) {
+        return invalidOperator("date");
+    }
+    return {
+        status: "ok",
+        filter: { propertyId, date: parsed.output },
+    };
+}
 function resolvePropertyAddress(value, dataSource) {
-    const hasKey = "key" in value;
-    const hasPropertyId = "propertyId" in value;
+    const hasKey = Object.prototype.hasOwnProperty.call(value, "key");
+    const hasPropertyId = Object.prototype.hasOwnProperty.call(value, "propertyId");
     if (hasKey === hasPropertyId) {
         return {
             status: "error",
-            error: "Data source query filters must use exactly one of key or propertyId.",
+            error: "Data source query filters and sorts must use exactly one of key or propertyId.",
         };
     }
     let propertyId;
@@ -286,7 +417,7 @@ function resolvePropertyAddress(value, dataSource) {
                 error: "Data source query property key must be a string.",
             };
         }
-        if (!(value.key in dataSource.propertyIdsByKey)) {
+        if (!Object.prototype.hasOwnProperty.call(dataSource.propertyIdsByKey, value.key)) {
             return {
                 status: "error",
                 error: `Unknown property key "${value.key}" for data source "${dataSource.key}".`,
@@ -310,13 +441,13 @@ function resolvePropertyAddress(value, dataSource) {
         }
         propertyId = value.propertyId;
     }
-    const propertySchema = dataSource.propertySchemasById[propertyId];
-    if (propertySchema === undefined) {
+    if (!Object.prototype.hasOwnProperty.call(dataSource.propertySchemasById, propertyId)) {
         return {
             status: "error",
             error: `Unknown property ID "${propertyId}" for data source "${dataSource.key}".`,
         };
     }
+    const propertySchema = dataSource.propertySchemasById[propertyId];
     return {
         status: "ok",
         propertyId,
@@ -336,32 +467,36 @@ function normalizeJsonValue(value) {
         return value;
     }
     if (typeof value === "number") {
-        if (!Number.isFinite(value)) {
-            throw new Error("Data source query values must be finite JSON numbers.");
-        }
-        return value;
+        return normalizeJsonNumber(value);
     }
     if (Array.isArray(value)) {
         return value.map(entry => normalizeJsonValue(entry));
     }
-    if (isPlainRecord(value)) {
-        const normalized = {};
-        for (const key of Object.keys(value).sort()) {
-            const child = value[key];
-            if (child !== undefined) {
-                normalized[key] = normalizeJsonValue(child);
-            }
-        }
-        return normalized;
+    if (typeof value === "object") {
+        return normalizeJsonObject(value);
     }
     throw new Error("Data source query values must be JSON-compatible.");
 }
-function isPlainRecord(value) {
-    return (typeof value === "object" &&
-        value !== null &&
-        !Array.isArray(value) &&
-        (Object.getPrototypeOf(value) === Object.prototype ||
-            Object.getPrototypeOf(value) === null));
+function normalizeJsonNumber(value) {
+    if (!Number.isFinite(value)) {
+        throw new Error("Data source query values must be finite JSON numbers.");
+    }
+    return value;
+}
+function normalizeJsonObject(value) {
+    const prototype = Object.getPrototypeOf(value);
+    if (prototype !== Object.prototype && prototype !== null) {
+        throw new Error("Data source query values must be JSON-compatible.");
+    }
+    const objectValue = value;
+    const normalized = {};
+    for (const key of Object.keys(objectValue).sort()) {
+        const child = objectValue[key];
+        if (child !== undefined) {
+            normalized[key] = normalizeJsonValue(child);
+        }
+    }
+    return normalized;
 }
 function isValidIsoDate(value) {
     if (typeof value !== "string") {

package/dist/protocol/dataSources/propertySchema.d.ts

@@ -43,6 +43,13 @@ export declare const notionPropertyTypeSchema: v.PicklistSchema<readonly ["title
  * payload shapes.
  */
 export type NotionPropertyType = v.InferOutput<typeof notionPropertyTypeSchema>;
+/**
+ * Property types currently supported by the custom-block data source sort API.
+ * Keep this list narrower than {@link NOTION_PROPERTY_TYPES} when a property
+ * type is exposed but its sort value is not yet represented by every host.
+ */
+export declare const CUSTOM_BLOCK_DATA_SOURCE_SORTABLE_PROPERTY_TYPES: readonly ["title", "rich_text", "number", "checkbox", "url", "email", "phone_number", "date", "created_time", "last_edited_time"];
+export type CustomBlockDataSourceSortablePropertyType = (typeof CUSTOM_BLOCK_DATA_SOURCE_SORTABLE_PROPERTY_TYPES)[number];
 /**
  * Per-property schema as exposed by the host over the custom-block bridge.
  * The `type` discriminator must be one of {@link NOTION_PROPERTY_TYPES}.

package/dist/protocol/dataSources/propertySchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"propertySchema.d.ts","sourceRoot":"","sources":["../../../../../home/runner/work/custom-blocks/custom-blocks/protocol/src/dataSources/propertySchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAE5B;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,iUAqBpC,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,WAAW,CAC9C,OAAO,yBAAyB,CAChC,CAAA;AAED,eAAO,MAAM,0BAA0B;;;;;aAKrC,CAAA;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,WAAW,CAC/C,OAAO,0BAA0B,CACjC,CAAA;AAED,eAAO,MAAM,uBAAuB;;;;;aAKlC,CAAA;AAEF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAE7E,eAAO,MAAM,wBAAwB;;;aAGnC,CAAA;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAA;AAO/E;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,4UA2BxB,CAAA;AAEV,eAAO,MAAM,wBAAwB,yWAAoC,CAAA;AAEzE;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAA;AAE/E;;;GAGG;AACH,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAiDrC,CAAA;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,WAAW,CAC/C,OAAO,0BAA0B,CACjC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,2BAA2B,+EAK9B,CAAA;AAEV,MAAM,MAAM,uBAAuB,GAClC,CAAC,OAAO,2BAA2B,CAAC,CAAC,MAAM,CAAC,CAAA"}
+{"version":3,"file":"propertySchema.d.ts","sourceRoot":"","sources":["../../../../../home/runner/work/custom-blocks/custom-blocks/protocol/src/dataSources/propertySchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAE5B;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,iUAqBpC,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,WAAW,CAC9C,OAAO,yBAAyB,CAChC,CAAA;AAED,eAAO,MAAM,0BAA0B;;;;;aAKrC,CAAA;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,WAAW,CAC/C,OAAO,0BAA0B,CACjC,CAAA;AAED,eAAO,MAAM,uBAAuB;;;;;aAKlC,CAAA;AAEF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAE7E,eAAO,MAAM,wBAAwB;;;aAGnC,CAAA;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAA;AAO/E;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,4UA2BxB,CAAA;AAEV,eAAO,MAAM,wBAAwB,yWAAoC,CAAA;AAEzE;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAA;AAE/E;;;;GAIG;AACH,eAAO,MAAM,gDAAgD,mIAWX,CAAA;AAElD,MAAM,MAAM,yCAAyC,GACpD,CAAC,OAAO,gDAAgD,CAAC,CAAC,MAAM,CAAC,CAAA;AAElE;;;GAGG;AACH,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAiDrC,CAAA;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,WAAW,CAC/C,OAAO,0BAA0B,CACjC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,2BAA2B,+EAK9B,CAAA;AAEV,MAAM,MAAM,uBAAuB,GAClC,CAAC,OAAO,2BAA2B,CAAC,CAAC,MAAM,CAAC,CAAA"}