@notionhq/custom-blocks 0.1.33 → 0.1.35

package/dist/bridge/dataSources/query.js

@@ -0,0 +1,512 @@
+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;
+    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 {
+            status: "error",
+            error: `Unknown data source key "${key}". Known keys: [${dataSources.map(entry => entry.key).join(", ")}].`,
+        };
+    }
+    if (dataSource.collectionPointer === undefined) {
+        return {
+            status: "error",
+            error: `Data source "${key}" has not been mapped to a database yet.`,
+        };
+    }
+    const limit = resolveDataSourceQueryLimit(queryOptions?.limit, warn);
+    if (limit.status === "error") {
+        return limit;
+    }
+    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",
+        dataSource,
+        query: {
+            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 };
+    }
+    if (typeof limit !== "number" ||
+        !Number.isFinite(limit) ||
+        !Number.isInteger(limit) ||
+        limit < 1) {
+        return {
+            status: "error",
+            error: `Data source query limit must be a positive integer between 1 and ${MAX_DATA_SOURCE_QUERY_LIMIT}.`,
+        };
+    }
+    if (limit > MAX_DATA_SOURCE_QUERY_LIMIT) {
+        warn?.(`Data source query limit ${limit} exceeds the maximum of ${MAX_DATA_SOURCE_QUERY_LIMIT}; clamping to ${MAX_DATA_SOURCE_QUERY_LIMIT}.`);
+        return { status: "ok", limit: MAX_DATA_SOURCE_QUERY_LIMIT };
+    }
+    return { status: "ok", limit };
+}
+export function getDataSourceQueryOptionsIdentity(options) {
+    try {
+        return stableJsonStringify(options ?? {});
+    }
+    catch {
+        return "invalid-data-source-query-options";
+    }
+}
+function stableJsonStringify(value) {
+    return JSON.stringify(normalizeJsonValue(value));
+}
+function resolveFilter(filter, dataSource) {
+    if (filter === undefined) {
+        return { status: "ok" };
+    }
+    if (typeof filter !== "object" || filter === null || Array.isArray(filter)) {
+        return {
+            status: "error",
+            error: "Data source query filter must be an object.",
+        };
+    }
+    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 (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 filterObject.and) {
+            const resolved = resolvePropertyFilter(child, dataSource);
+            if (resolved.status === "error") {
+                return resolved;
+            }
+            and.push(resolved.filter);
+        }
+        return { status: "ok", filter: { and } };
+    }
+    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 (typeof filter !== "object" || filter === null || Array.isArray(filter)) {
+        return {
+            status: "error",
+            error: "Data source query property filter must be an object.",
+        };
+    }
+    const filterObject = filter;
+    const property = resolvePropertyAddress(filterObject, dataSource);
+    if (property.status === "error") {
+        return property;
+    }
+    const branchKeys = Object.keys(filterObject).filter(key => key !== "key" && key !== "propertyId");
+    if (branchKeys.length !== 1) {
+        return {
+            status: "error",
+            error: "Data source query property filter must contain exactly one property branch.",
+        };
+    }
+    const branch = branchKeys[0];
+    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) {
+        return {
+            status: "error",
+            error: `Data source query filter branch "${branch}" does not match property type "${property.propertyType}".`,
+        };
+    }
+    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":
+            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: 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 },
+            };
+        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: "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 = 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 and sorts must use exactly one of key or propertyId.",
+        };
+    }
+    let propertyId;
+    if (hasKey) {
+        if (typeof value.key !== "string") {
+            return {
+                status: "error",
+                error: "Data source query property key must be a string.",
+            };
+        }
+        if (!Object.prototype.hasOwnProperty.call(dataSource.propertyIdsByKey, value.key)) {
+            return {
+                status: "error",
+                error: `Unknown property key "${value.key}" for data source "${dataSource.key}".`,
+            };
+        }
+        const resolvedPropertyId = dataSource.propertyIdsByKey[value.key];
+        if (resolvedPropertyId === undefined) {
+            return {
+                status: "error",
+                error: `Property key "${value.key}" for data source "${dataSource.key}" is not bound.`,
+            };
+        }
+        propertyId = resolvedPropertyId;
+    }
+    else {
+        if (typeof value.propertyId !== "string") {
+            return {
+                status: "error",
+                error: "Data source query propertyId must be a string.",
+            };
+        }
+        propertyId = value.propertyId;
+    }
+    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,
+        propertyType: propertySchema.type,
+    };
+}
+function invalidOperator(branch) {
+    return {
+        status: "error",
+        error: `Data source query filter branch "${branch}" has an invalid operator or value.`,
+    };
+}
+function normalizeJsonValue(value) {
+    if (value === null ||
+        typeof value === "string" ||
+        typeof value === "boolean") {
+        return value;
+    }
+    if (typeof value === "number") {
+        return normalizeJsonNumber(value);
+    }
+    if (Array.isArray(value)) {
+        return value.map(entry => normalizeJsonValue(entry));
+    }
+    if (typeof value === "object") {
+        return normalizeJsonObject(value);
+    }
+    throw new Error("Data source query values must be JSON-compatible.");
+}
+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") {
+        return false;
+    }
+    const dateOnly = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
+    if (dateOnly !== null) {
+        const [, year, month, day] = dateOnly;
+        const date = new Date(Date.UTC(Number(year), Number(month) - 1, Number(day)));
+        return date.toISOString().slice(0, 10) === value;
+    }
+    return (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d{1,3})?)?(?:Z|[+-]\d{2}:\d{2})$/.test(value) && Number.isFinite(Date.parse(value)));
+}

package/dist/bridge/hostState.d.ts

@@ -29,15 +29,16 @@ export type InitializedHostState = {
     dataSourceState: Record<string, DataSourceQueryState>;
 };
 export type DataSourceQueryState = {
+    dataSourceKey: string;
     /** Latest pages from the host as parsed from the bridge. `propertiesByKey` is derived lazily. */
     items: NotionDataSourcePageBridge[];
     isLoading: boolean;
     hasMore: boolean;
     error?: CustomBlockQueryDataSourceErrorInfo;
-    subscriptionId?: string;
     latestLimit?: number;
+    latestQueryIdentity?: string;
 };
-export declare function createEmptyDataSourceQueryState(): DataSourceQueryState;
+export declare function createEmptyDataSourceQueryState(dataSourceKey: string): DataSourceQueryState;
 /**
  * Resolved page + schema views for a single data source, keyed by raw property
  * ID and by user-defined key. Re-derived from `propertyIdsByKey` on every read so
@@ -69,5 +70,5 @@ export type UpdateDataSourcePageFn = (args: {
     pageId: NotionPageId;
     pageUpdateArgs: NotionDataSourcePageUpdateArgs;
 }) => Promise<UpdatePageResult>;
-export declare function getDataSourceQueryView(hostState: CustomBlockHostState, key: string, updateDataSourcePage: UpdateDataSourcePageFn): DataSourceQueryView;
+export declare function getDataSourceQueryView(hostState: CustomBlockHostState, key: string, subscriptionId: string, updateDataSourcePage: UpdateDataSourcePageFn): DataSourceQueryView;
 //# sourceMappingURL=hostState.d.ts.map

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

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

package/dist/bridge/hostState.js

@@ -1,5 +1,6 @@
-export function createEmptyDataSourceQueryState() {
+export function createEmptyDataSourceQueryState(dataSourceKey) {
     return {
+        dataSourceKey,
         items: [],
         isLoading: false,
         hasMore: false,
@@ -13,12 +14,15 @@ const EMPTY_QUERY_VIEW = {
     isLoading: false,
     hasMore: false,
 };
-export function getDataSourceQueryView(hostState, key, updateDataSourcePage) {
+export function getDataSourceQueryView(hostState, key, subscriptionId, updateDataSourcePage) {
     if (hostState.status !== "initialized") {
         return EMPTY_QUERY_VIEW;
     }
     const dataSource = hostState.dataSources.find(entry => entry.key === key);
-    const queryState = hostState.dataSourceState[key] ?? createEmptyDataSourceQueryState();
+    const subscriptionState = hostState.dataSourceState[subscriptionId];
+    const queryState = subscriptionState?.dataSourceKey === key
+        ? subscriptionState
+        : createEmptyDataSourceQueryState(key);
     if (dataSource === undefined) {
         return {
             items: [],

package/dist/bridge/sandboxClient.d.ts

@@ -19,8 +19,10 @@ export declare const customBlockHost: {
     postResize: (height: number) => void;
 };
 export declare const customBlockDataSources: {
-    query: (key: string, options?: UseDataSourceOptions) => void;
-    getView: (hostState: CustomBlockHostState, key: string) => DataSourceQueryView;
+    createSubscriptionId: () => string;
+    query: (subscriptionId: string, key: string, options?: UseDataSourceOptions) => void;
+    release: (subscriptionId: string) => void;
+    getView: (hostState: CustomBlockHostState, key: string, subscriptionId: string) => DataSourceQueryView;
 };
 export declare const messageLog: {
     getSnapshot: () => readonly MessageLogEntry[];

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

@@ -1 +1 @@
-{"version":3,"file":"sandboxClient.d.ts","sourceRoot":"","sources":["../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/bridge/sandboxClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAA;AACpF,OAAO,KAAK,EACX,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,MAAM,aAAa,CAAA;AACpB,OAAO,EACN,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EAExB,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,KAAK,eAAe,EAAiB,MAAM,oBAAoB,CAAA;AAWxE,eAAO,MAAM,eAAe;;kCAKG,kBAAkB;yBAI3B,WAAW,KAAG,OAAO,CAAC,IAAI,CAAC;0BAI1B,MAAM,IAAI;oBAIlB,oBAAoB;IAIlC;;;OAGG;4BACqB,WAAW;;yBAQd,MAAM;CAG3B,CAAA;AAED,eAAO,MAAM,sBAAsB;iBACrB,MAAM,YAAY,oBAAoB;yBAKvC,oBAAoB,OAC1B,MAAM,KACT,mBAAmB;CAKtB,CAAA;AAED,eAAO,MAAM,UAAU;uBACL,SAAS,eAAe,EAAE;0BAIrB,MAAM,IAAI;CAGhC,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,KAAK;IACjB;;OAEG;oBACa,cAAc,KAAG,OAAO,CAAC,gBAAgB,CAAC;IAI1D;;OAEG;kBACW,YAAY,KAAG,OAAO,CAAC,aAAa,CAAC;IAInD;;OAEG;oBACa,cAAc,KAAG,OAAO,CAAC,gBAAgB,CAAC;IAI1D;;OAEG;qBACc,YAAY,KAAG,OAAO,CAAC,gBAAgB,CAAC;CAGzD,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,KAAK;IACjB;;OAEG;mBACY,aAAa,KAAG,OAAO,CAAC,eAAe,CAAC;IAIvD;;OAEG;kBACW,YAAY,KAAG,OAAO,CAAC,aAAa,CAAC;CAGnD,CAAA"}
+{"version":3,"file":"sandboxClient.d.ts","sourceRoot":"","sources":["../../../../home/runner/work/custom-blocks/custom-blocks/sdk/src/bridge/sandboxClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAA;AACpF,OAAO,KAAK,EACX,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,aAAa,EACb,eAAe,EACf,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,MAAM,aAAa,CAAA;AACpB,OAAO,EACN,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EAExB,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,KAAK,eAAe,EAAiB,MAAM,oBAAoB,CAAA;AAWxE,eAAO,MAAM,eAAe;;kCAKG,kBAAkB;yBAI3B,WAAW,KAAG,OAAO,CAAC,IAAI,CAAC;0BAI1B,MAAM,IAAI;oBAIlB,oBAAoB;IAIlC;;;OAGG;4BACqB,WAAW;;yBAQd,MAAM;CAG3B,CAAA;AAED,eAAO,MAAM,sBAAsB;;4BAMjB,MAAM,OACjB,MAAM,YACD,oBAAoB;8BAKL,MAAM;yBAKpB,oBAAoB,OAC1B,MAAM,kBACK,MAAM,KACpB,mBAAmB;CAQtB,CAAA;AAED,eAAO,MAAM,UAAU;uBACL,SAAS,eAAe,EAAE;0BAIrB,MAAM,IAAI;CAGhC,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,KAAK;IACjB;;OAEG;oBACa,cAAc,KAAG,OAAO,CAAC,gBAAgB,CAAC;IAI1D;;OAEG;kBACW,YAAY,KAAG,OAAO,CAAC,aAAa,CAAC;IAInD;;OAEG;oBACa,cAAc,KAAG,OAAO,CAAC,gBAAgB,CAAC;IAI1D;;OAEG;qBACc,YAAY,KAAG,OAAO,CAAC,gBAAgB,CAAC;CAGzD,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,KAAK;IACjB;;OAEG;mBACY,aAAa,KAAG,OAAO,CAAC,eAAe,CAAC;IAIvD;;OAEG;kBACW,YAAY,KAAG,OAAO,CAAC,aAAa,CAAC;CAGnD,CAAA"}

package/dist/bridge/sandboxClient.js

@@ -38,11 +38,17 @@ export const customBlockHost = {
     },
 };
 export const customBlockDataSources = {
-    query: (key, options) => {
-        getBridge().queryDataSource(key, options);
+    createSubscriptionId: () => {
+        return getBridge().createDataSourceSubscriptionId();
     },
-    getView: (hostState, key) => {
-        return getDataSourceQueryViewWithBridge(hostState, key, args => getBridge().updateDataSourcePage(args));
+    query: (subscriptionId, key, options) => {
+        getBridge().queryDataSource(subscriptionId, key, options);
+    },
+    release: (subscriptionId) => {
+        getBridge().releaseDataSourceSubscription(subscriptionId);
+    },
+    getView: (hostState, key, subscriptionId) => {
+        return getDataSourceQueryViewWithBridge(hostState, key, subscriptionId, args => getBridge().updateDataSourcePage(args));
     },
 };
 export const messageLog = {

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"}

package/dist/protocol/dataSources/propertySchema.js

@@ -84,6 +84,23 @@ export const NOTION_PROPERTY_TYPES = [
     "last_edited_by",
 ];
 export const notionPropertyTypeSchema = v.picklist(NOTION_PROPERTY_TYPES);
+/**
+ * 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 const CUSTOM_BLOCK_DATA_SOURCE_SORTABLE_PROPERTY_TYPES = [
+    "title",
+    "rich_text",
+    "number",
+    "checkbox",
+    "url",
+    "email",
+    "phone_number",
+    "date",
+    "created_time",
+    "last_edited_time",
+];
 /**
  * Per-property schema as exposed by the host over the custom-block bridge.
  * The `type` discriminator must be one of {@link NOTION_PROPERTY_TYPES}.