@notionhq/custom-blocks 0.1.33 → 0.1.34

package/dist/bridge/SandboxBridge.d.ts

@@ -65,8 +65,10 @@ export declare class SandboxBridge {
      * iframe covered throughout this frame, so it can apply the measured height before first paint.
      */
     private scheduleInitResult;
-    queryDataSource(key: string, options?: UseDataSourceOptions): void;
+    createDataSourceSubscriptionId(): string;
+    queryDataSource(subscriptionId: string, key: string, options?: UseDataSourceOptions): void;
     private setDataSourceQueryError;
+    releaseDataSourceSubscription(subscriptionId: string): void;
     postResize(height: number): void;
     createPage(args: CreatePageArgs): Promise<CreatePageResult>;
     getPage(pageId: NotionPageId): Promise<GetPageResult>;

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

@@ -7,6 +7,7 @@ import * as v from "valibot";
 import { unreachable } from "../utils.js";
 import { CUSTOM_BLOCKS_SDK_VERSION } from "../version.js";
 import { NOTION_DARK_BACKGROUND_BASE, NOTION_LIGHT_BACKGROUND_BASE, } from "./appearance.js";
+import { resolveDataSourceQuery } from "./dataSources/query.js";
 import { resolveDataSources } from "./dataSources/resolve.js";
 import { resolvePropertyWriteMapForDataSource } from "./dataSources/resolveProperty.js";
 import { createEmptyDataSourceQueryState, } from "./hostState.js";
@@ -169,12 +170,12 @@ export class SandboxBridge {
                         nextBindings,
                     });
                     this.latestDataSourceBindings = nextBindings;
-                    // Drop cached query state for keys that no longer exist in the mapping.
+                    // Drop cached query state for subscriptions whose key no longer exists.
                     const nextKeys = new Set(dataSources.map(s => s.key));
                     const prunedState = {};
-                    for (const [key, state] of Object.entries(hostState.dataSourceState)) {
-                        if (nextKeys.has(key)) {
-                            prunedState[key] = state;
+                    for (const [subscriptionId, state] of Object.entries(hostState.dataSourceState)) {
+                        if (nextKeys.has(state.dataSourceKey)) {
+                            prunedState[subscriptionId] = state;
                         }
                     }
                     this.hostState = {
@@ -231,11 +232,10 @@ export class SandboxBridge {
                     return;
                 }
                 case "queryDataSourceResult": {
-                    const queryEntry = Object.entries(hostState.dataSourceState).find(([, state]) => state.subscriptionId === message.subscriptionId);
-                    if (queryEntry === undefined) {
+                    const currentState = hostState.dataSourceState[message.subscriptionId];
+                    if (currentState === undefined) {
                         return;
                     }
-                    const [key, currentState] = queryEntry;
                     const queryResult = message.status === "error"
                         ? {
                             items: [],
@@ -251,13 +251,14 @@ export class SandboxBridge {
                         ...hostState,
                         dataSourceState: {
                             ...hostState.dataSourceState,
-                            [key]: {
+                            [message.subscriptionId]: {
+                                dataSourceKey: currentState.dataSourceKey,
                                 items: queryResult.items,
                                 isLoading: false,
                                 hasMore: queryResult.hasMore,
                                 error: queryResult.error,
-                                subscriptionId: message.subscriptionId,
                                 latestLimit: currentState.latestLimit,
+                                latestQueryIdentity: currentState.latestQueryIdentity,
                             },
                         },
                     };
@@ -512,14 +513,20 @@ export class SandboxBridge {
             requestAnimationFrame(acknowledge);
         }
     }
-    queryDataSource(key, options = {}) {
+    createDataSourceSubscriptionId() {
+        return `data-source:${globalThis.crypto.randomUUID()}`;
+    }
+    queryDataSource(subscriptionId, key, options = {}) {
         if (this.hostState.status !== "initialized") {
             return;
         }
         const dataSource = this.hostState.dataSources.find(entry => entry.key === key);
-        const currentState = this.hostState.dataSourceState[key] ?? createEmptyDataSourceQueryState();
+        const subscriptionState = this.hostState.dataSourceState[subscriptionId];
+        const currentState = subscriptionState?.dataSourceKey === key
+            ? subscriptionState
+            : createEmptyDataSourceQueryState(key);
         if (dataSource === undefined) {
-            this.setDataSourceQueryError(key, currentState, {
+            this.setDataSourceQueryError(subscriptionId, currentState, {
                 code: "unknown_data_source_key",
                 message: `Unknown data source key "${key}". Known keys: [${this.hostState.dataSources.map(entry => entry.key).join(", ")}].`,
                 isRetryable: false,
@@ -527,32 +534,42 @@ export class SandboxBridge {
             return;
         }
         if (dataSource.collectionPointer === undefined) {
-            this.setDataSourceQueryError(key, currentState, {
+            this.setDataSourceQueryError(subscriptionId, currentState, {
                 code: "unmapped_data_source",
                 message: `Data source "${key}" has not been mapped to a database yet.`,
                 isRetryable: false,
             });
             return;
         }
-        const limit = resolveDataSourceQueryLimit(options.limit);
-        const subscriptionId = makeDataSourceSubscriptionId({
+        const resolvedQuery = resolveDataSourceQuery({
+            dataSources: this.hostState.dataSources,
             key,
+            options,
         });
+        if (resolvedQuery.status === "error") {
+            this.setDataSourceQueryError(subscriptionId, currentState, {
+                code: "invalid_data_source_query",
+                message: resolvedQuery.error,
+                isRetryable: false,
+            });
+            return;
+        }
+        const query = resolvedQuery.query;
         if (currentState.isLoading &&
-            currentState.subscriptionId === subscriptionId &&
-            currentState.latestLimit === limit) {
+            currentState.latestQueryIdentity === query.identity) {
             return;
         }
         this.hostState = {
             ...this.hostState,
             dataSourceState: {
                 ...this.hostState.dataSourceState,
-                [key]: {
+                [subscriptionId]: {
                     ...currentState,
+                    dataSourceKey: key,
                     isLoading: true,
                     error: undefined,
-                    subscriptionId,
-                    latestLimit: limit,
+                    latestLimit: query.limit,
+                    latestQueryIdentity: query.identity,
                 },
             },
         };
@@ -560,12 +577,13 @@ export class SandboxBridge {
         const outbound = {
             type: "queryDataSource",
             subscriptionId,
-            dataSourceId: dataSource.collectionPointer.id,
-            limit,
+            dataSourceId: query.dataSourceId,
+            limit: query.limit,
+            ...(query.filter !== undefined ? { filter: query.filter } : {}),
         };
         this.postToHost(outbound);
     }
-    setDataSourceQueryError(key, currentState, error) {
+    setDataSourceQueryError(subscriptionId, currentState, error) {
         if (this.hostState.status !== "initialized") {
             return;
         }
@@ -573,17 +591,28 @@ export class SandboxBridge {
             ...this.hostState,
             dataSourceState: {
                 ...this.hostState.dataSourceState,
-                [key]: {
+                [subscriptionId]: {
                     ...currentState,
                     isLoading: false,
                     error,
-                    subscriptionId: undefined,
                     latestLimit: undefined,
+                    latestQueryIdentity: undefined,
                 },
             },
         };
         this.notify();
     }
+    releaseDataSourceSubscription(subscriptionId) {
+        if (this.hostState.status !== "initialized" ||
+            this.hostState.dataSourceState[subscriptionId] === undefined) {
+            return;
+        }
+        const { [subscriptionId]: _, ...dataSourceState } = this.hostState.dataSourceState;
+        this.hostState = {
+            ...this.hostState,
+            dataSourceState,
+        };
+    }
     postResize(height) {
         if (typeof window === "undefined") {
             return;
@@ -833,28 +862,6 @@ function reuseDataSourcesForUnchangedBindings(args) {
         return dataSource;
     });
 }
-// The default number of items to return in a live snapshot response if no limit is provided.
-const DEFAULT_DATA_SOURCE_QUERY_LIMIT = 20;
-// The maximum number of items to return in a single live snapshot response.
-const MAX_DATA_SOURCE_QUERY_LIMIT = 999;
-function resolveDataSourceQueryLimit(limit) {
-    if (limit === undefined) {
-        return DEFAULT_DATA_SOURCE_QUERY_LIMIT;
-    }
-    if (!Number.isFinite(limit) || !Number.isInteger(limit) || limit < 1) {
-        console.warn(`[custom-blocks-sdk] useDataSource limit must be a positive integer; using ${DEFAULT_DATA_SOURCE_QUERY_LIMIT}.`);
-        return DEFAULT_DATA_SOURCE_QUERY_LIMIT;
-    }
-    if (limit > MAX_DATA_SOURCE_QUERY_LIMIT) {
-        console.warn(`[custom-blocks-sdk] useDataSource limit is capped at ${MAX_DATA_SOURCE_QUERY_LIMIT}.`);
-        return MAX_DATA_SOURCE_QUERY_LIMIT;
-    }
-    return limit;
-}
-function makeDataSourceSubscriptionId(args) {
-    const { key } = args;
-    return `data-source:${encodeURIComponent(key)}`;
-}
 function invalidInitPayloadError(issues) {
     return {
         code: "invalid_init_payload",

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

@@ -0,0 +1,26 @@
+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 { UseDataSourceOptions } from "../../types.js";
+export type ResolvedDataSourceQuery = {
+    dataSourceId: NotionDataSourceId;
+    limit: number;
+    filter?: ResolvedCustomBlockDataSourceFilter;
+    identity: string;
+};
+export type ResolveDataSourceQueryResult = {
+    status: "error";
+    error: string;
+} | {
+    status: "ok";
+    dataSource: NotionDataSource;
+    query: ResolvedDataSourceQuery;
+};
+export declare function resolveDataSourceQuery(args: {
+    dataSources: NotionDataSource[];
+    key: string;
+    options?: unknown;
+    warn?: (message: string) => void;
+}): ResolveDataSourceQueryResult;
+export declare function getDataSourceQueryOptionsIdentity(options: UseDataSourceOptions | undefined): string;
+//# sourceMappingURL=query.d.ts.map

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

@@ -0,0 +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"}

package/dist/bridge/dataSources/query.js

@@ -0,0 +1,377 @@
+import { customBlockCheckboxFilterOperatorSchema, customBlockContainsFilterOperatorSchema, customBlockDateFilterOperatorSchema, customBlockNumberFilterOperatorSchema, customBlockOptionFilterOperatorSchema, customBlockTextFilterOperatorSchema, } from "../../protocol/messages/queryDataSource.js";
+import * as v from "valibot";
+const DEFAULT_DATA_SOURCE_QUERY_LIMIT = 20;
+const MAX_DATA_SOURCE_QUERY_LIMIT = 999;
+const MAX_DATA_SOURCE_QUERY_FILTER_CHILDREN = 25;
+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 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(options?.limit, warn);
+    if (limit.status === "error") {
+        return limit;
+    }
+    const filter = resolveFilter(options?.filter, dataSource);
+    if (filter.status === "error") {
+        return filter;
+    }
+    const identity = stableJsonStringify({
+        dataSourceId: dataSource.collectionPointer.id,
+        limit: limit.limit,
+        filter: filter.filter ?? null,
+    });
+    return {
+        status: "ok",
+        dataSource,
+        query: {
+            dataSourceId: dataSource.collectionPointer.id,
+            limit: limit.limit,
+            filter: filter.filter,
+            identity,
+        },
+    };
+}
+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 (!isPlainRecord(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)) {
+            return {
+                status: "error",
+                error: 'Data source query filter "and" must be an array.',
+            };
+        }
+        if (filter.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) {
+            const resolved = resolvePropertyFilter(child, dataSource);
+            if (resolved.status === "error") {
+                return resolved;
+            }
+            and.push(resolved.filter);
+        }
+        return { status: "ok", filter: { and } };
+    }
+    return resolvePropertyFilter(filter, dataSource);
+}
+function resolvePropertyFilter(filter, dataSource) {
+    if (!isPlainRecord(filter)) {
+        return {
+            status: "error",
+            error: "Data source query property filter must be an object.",
+        };
+    }
+    const property = resolvePropertyAddress(filter, dataSource);
+    if (property.status === "error") {
+        return property;
+    }
+    const branchKeys = Object.keys(filter).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 = filter[branch];
+    if (!isPlainRecord(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}".`,
+        };
+    }
+    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);
+        }
+        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 },
+                };
+            }
+            return {
+                status: "ok",
+                filter: {
+                    propertyId: property.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 {
+                status: "error",
+                error: `Data source query filter branch "${branch}" is not supported.`,
+            };
+    }
+}
+function resolvePropertyAddress(value, dataSource) {
+    const hasKey = "key" in value;
+    const hasPropertyId = "propertyId" in value;
+    if (hasKey === hasPropertyId) {
+        return {
+            status: "error",
+            error: "Data source query filters 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 (!(value.key in dataSource.propertyIdsByKey)) {
+            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;
+    }
+    const propertySchema = dataSource.propertySchemasById[propertyId];
+    if (propertySchema === undefined) {
+        return {
+            status: "error",
+            error: `Unknown property ID "${propertyId}" for data source "${dataSource.key}".`,
+        };
+    }
+    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") {
+        if (!Number.isFinite(value)) {
+            throw new Error("Data source query values must be finite JSON numbers.");
+        }
+        return 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;
+    }
+    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 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