@notionhq/custom-blocks-host 0.2.3 → 0.2.5

package/README.md

@@ -179,9 +179,9 @@ For SDKs using protocol 3 or 4, the runtime adds synthetic metadata schemas to o
 the actual database schema supplied by the host. Protocol 5 SDKs receive that schema directly and
 add the metadata read schemas themselves.
 
-The runtime validates option names, supported sort types, and the limit of ten unique sort
-properties before it invokes the handler. Sorts retain their array order. Extra fields and mixed
-filter types fail protocol validation.
+The runtime validates option names, Status group names, supported sort types, and ten unique sort
+properties before it invokes the handler. It checks group names against the current bound schema.
+Sorts retain their array order. Extra fields and mixed filter types fail protocol validation.
 
 Derive bindings from the successful `connect` message inside `getInitialState` and return them in
 `initialState.dataSources`.
@@ -246,7 +246,10 @@ The returned handle exposes:
 
 State updates are sent after `initResult.success`. Updates made earlier are held until
 initialization completes. `refreshQuery()` re-runs `queryDataSource` for every active subscription
-with the supplied data source ID, preserving each subscription's filter, sorts, and limit.
+with the supplied data source ID, preserving each subscription's filter, sorts, and limit. If that
+query is already running, refresh requests coalesce into one follow-up query. The running query
+delivers its snapshot before the follow-up starts, so continuous changes do not starve updates.
+Unsubscribing, replacing the query, or stopping the host discards its queued refresh.
 
 After `stop()`, the host drops outbound messages, including pending request responses. The runtime
 removes a subscription when it receives `unsubscribeDataSourceQuery`. Repeated unsubscribe messages

package/dist/createCustomBlockHost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCustomBlockHost.d.ts","sourceRoot":"","sources":["../src/createCustomBlockHost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AAI5F,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAA;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AAiBvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAA;AAC3F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAA;AAEpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAA;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAA;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAKzC,OAAO,KAAK,EACX,iCAAiC,EACjC,8BAA8B,EAI9B,MAAM,sBAAsB,CAAA;AAG7B,OAAO,KAAK,EACX,sBAAsB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,MAAM,qBAAqB,CAAA;AAe5B,MAAM,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,iBAAiB,CAAA;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,EAAE,uBAAuB,CAAA;IACjC,oHAAoH;IACpH,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACpD,gGAAgG;IAChG,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,QAAQ,EAAE,mBAAmB,CAAA;QAC7B,aAAa,CAAC,EAAE,MAAM,CAAA;KACtB,KAAK,IAAI,CAAA;IACV;;;;;OAKG;IACH,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAA;IACnD,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC1E,eAAe,EAAE,8BAA8B,CAAA;IAC/C,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,QAAQ,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,IAAI,CAAA;IAC/D,eAAe,EAAE,CAChB,YAAY,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,KACrD,IAAI,CAAA;IACT,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,KAAK,IAAI,CAAA;IAClE,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,KAAK,IAAI,CAAA;IACjE,cAAc,EAAE,CAAC,WAAW,EAAE,iCAAiC,KAAK,IAAI,CAAA;IACxE,cAAc,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,KAAK,IAAI,CAAA;IAC1E,YAAY,EAAE,CAAC,IAAI,EAAE;QACpB,YAAY,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAA;KACzD,KAAK,IAAI,CAAA;CACV,CAAA;AAQD,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,sBAAsB,GAC7B,qBAAqB,CAgYvB"}
+{"version":3,"file":"createCustomBlockHost.d.ts","sourceRoot":"","sources":["../src/createCustomBlockHost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAA;AAI5F,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAA;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AAiBvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAA;AAC3F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAA;AAEpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAA;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAA;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAKzC,OAAO,KAAK,EACX,iCAAiC,EACjC,8BAA8B,EAI9B,MAAM,sBAAsB,CAAA;AAG7B,OAAO,KAAK,EACX,sBAAsB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,MAAM,qBAAqB,CAAA;AAe5B,MAAM,MAAM,sBAAsB,GAAG;IACpC,MAAM,EAAE,iBAAiB,CAAA;IACzB,aAAa,EAAE,MAAM,CAAA;IACrB;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,EAAE,uBAAuB,CAAA;IACjC,oHAAoH;IACpH,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACpD,gGAAgG;IAChG,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,QAAQ,EAAE,mBAAmB,CAAA;QAC7B,aAAa,CAAC,EAAE,MAAM,CAAA;KACtB,KAAK,IAAI,CAAA;IACV;;;;;OAKG;IACH,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAA;IACnD,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,2BAA2B,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC1E,eAAe,EAAE,8BAA8B,CAAA;IAC/C,qBAAqB,CAAC,EAAE,MAAM,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,QAAQ,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAAK,IAAI,CAAA;IAC/D,eAAe,EAAE,CAChB,YAAY,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,KACrD,IAAI,CAAA;IACT,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,KAAK,IAAI,CAAA;IAClE,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,KAAK,IAAI,CAAA;IACjE,cAAc,EAAE,CAAC,WAAW,EAAE,iCAAiC,KAAK,IAAI,CAAA;IACxE,cAAc,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,KAAK,IAAI,CAAA;IAC1E,YAAY,EAAE,CAAC,IAAI,EAAE;QACpB,YAAY,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAA;KACzD,KAAK,IAAI,CAAA;CACV,CAAA;AAQD,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,sBAAsB,GAC7B,qBAAqB,CAuYvB"}

package/dist/createCustomBlockHost.js

@@ -109,25 +109,33 @@ export function createCustomBlockHost(options) {
         sendInitializedMessage(message);
     }
     async function handleQuery(message, token = querySubscriptions.subscribe(message)) {
-        const collectionSchema = getCollectionSchema(activeDataSources, message.dataSourceId);
-        const queryError = getQueryValidationError(message, collectionSchema);
-        if (queryError !== undefined) {
-            if (querySubscriptions.isCurrent(message.subscriptionId, token)) {
-                postQueryDataSourceResult({
-                    subscriptionId: message.subscriptionId,
-                    response: { status: "error", error: queryError },
-                });
+        try {
+            const collectionSchema = getCollectionSchema(activeDataSources, message.dataSourceId);
+            const queryError = getQueryValidationError(message, collectionSchema);
+            if (queryError !== undefined) {
+                if (querySubscriptions.isCurrent(message.subscriptionId, token)) {
+                    postQueryDataSourceResult({
+                        subscriptionId: message.subscriptionId,
+                        response: { status: "error", error: queryError },
+                    });
+                }
+                return;
             }
-            return;
+            const response = await handlers.queryDataSource(message);
+            if (!querySubscriptions.isCurrent(message.subscriptionId, token)) {
+                return;
+            }
+            postQueryDataSourceResult({
+                subscriptionId: message.subscriptionId,
+                response,
+            });
         }
-        const response = await handlers.queryDataSource(message);
-        if (!querySubscriptions.isCurrent(message.subscriptionId, token)) {
-            return;
+        finally {
+            const refresh = querySubscriptions.finish(message.subscriptionId, token);
+            if (refresh !== undefined) {
+                void handleQuery(refresh.message, refresh.token);
+            }
         }
-        postQueryDataSourceResult({
-            subscriptionId: message.subscriptionId,
-            response,
-        });
     }
     function updateHostState(update) {
         if (initializationController.status === "stopped" ||
@@ -313,7 +321,7 @@ export function createCustomBlockHost(options) {
             }
             const normalizedDataSourceId = v.parse(notionDataSourceIdSchema, dataSourceId);
             const refreshes = querySubscriptions.refresh(normalizedDataSourceId);
-            if (refreshes.length === 0) {
+            if (refreshes === undefined) {
                 emit("warn", `No active query exists for data source "${dataSourceId}"`);
                 return;
             }

package/dist/index.d.ts

@@ -4,7 +4,7 @@ export type { GetPageMessage } from "./protocol/messages/getPage.js";
 export type { GetUserMessage } from "./protocol/messages/getUser.js";
 export type { ListUsersMessage } from "./protocol/messages/listUsers.js";
 export type { OpenPageMessage } from "./protocol/messages/openPage.js";
-export type { CustomBlockCheckboxFilterOperator, CustomBlockContainsFilterOperator, CustomBlockCreatedByFilterOperator, CustomBlockDateFilterOperator, CustomBlockNumberFilterOperator, CustomBlockOptionFilterOperator, CustomBlockPeopleFilterOperator, CustomBlockPersonFilterValue, CustomBlockTextFilterOperator, QueryDataSourceMessage, ResolvedCustomBlockDataSourceFilter, ResolvedCustomBlockDataSourcePropertyFilter, ResolvedCustomBlockDataSourceSort, } from "./protocol/messages/queryDataSource.js";
+export type { CustomBlockCheckboxFilterOperator, CustomBlockContainsFilterOperator, CustomBlockCreatedByFilterOperator, CustomBlockDateFilterOperator, CustomBlockNumberFilterOperator, CustomBlockOptionFilterOperator, CustomBlockPeopleFilterOperator, CustomBlockPersonFilterValue, CustomBlockStatusFilterOperator, CustomBlockStatusGroupFilterOperator, CustomBlockStatusGroupName, CustomBlockTextFilterOperator, QueryDataSourceMessage, ResolvedCustomBlockDataSourceFilter, ResolvedCustomBlockDataSourcePropertyFilter, ResolvedCustomBlockDataSourceSort, } from "./protocol/messages/queryDataSource.js";
 export type { ResizeMessage } from "./protocol/messages/resize.js";
 export type { UpdatePageMessage } from "./protocol/messages/updatePage.js";
 export type { NotionDateInput, NotionFileInput, NotionPageCover, NotionPageIcon, NotionPagePropertyValue, NotionPagePropertyWriteMap, NotionRichTextItem, NotionSelectOptionInput, } from "./protocol/pages/page.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAA;AACtF,YAAY,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,YAAY,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,YAAY,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,YAAY,EAAE,gBAAgB,EAAE,MAAM,wDAAwD,CAAA;AAC9F,YAAY,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAA;AAC5F,YAAY,EACX,iCAAiC,EACjC,iCAAiC,EACjC,kCAAkC,EAClC,6BAA6B,EAC7B,+BAA+B,EAC/B,+BAA+B,EAC/B,+BAA+B,EAC/B,4BAA4B,EAC5B,6BAA6B,EAC7B,sBAAsB,EACtB,mCAAmC,EACnC,2CAA2C,EAC3C,iCAAiC,GACjC,MAAM,8DAA8D,CAAA;AACrE,YAAY,EAAE,aAAa,EAAE,MAAM,qDAAqD,CAAA;AACxF,YAAY,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,YAAY,EACX,eAAe,EACf,eAAe,EACf,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,0BAA0B,EAC1B,kBAAkB,EAClB,uBAAuB,GACvB,MAAM,gDAAgD,CAAA;AACvD,OAAO,EACN,KAAK,oBAAoB,EACzB,4BAA4B,GAC5B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACN,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,qBAAqB,GACrB,MAAM,4BAA4B,CAAA;AACnC,YAAY,EACX,qBAAqB,EACrB,iCAAiC,EACjC,8BAA8B,EAC9B,2BAA2B,EAC3B,iCAAiC,GACjC,MAAM,sBAAsB,CAAA;AAC7B,YAAY,EACX,sBAAsB,EACtB,+BAA+B,EAC/B,sBAAsB,EACtB,4BAA4B,EAC5B,4BAA4B,EAC5B,uBAAuB,EACvB,8BAA8B,EAC9B,2BAA2B,EAC3B,6BAA6B,EAC7B,+BAA+B,EAC/B,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,2BAA2B,EAC3B,kBAAkB,EAClB,sBAAsB,GACtB,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAA;AACtF,YAAY,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,YAAY,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,YAAY,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAA;AAC1F,YAAY,EAAE,gBAAgB,EAAE,MAAM,wDAAwD,CAAA;AAC9F,YAAY,EAAE,eAAe,EAAE,MAAM,uDAAuD,CAAA;AAC5F,YAAY,EACX,iCAAiC,EACjC,iCAAiC,EACjC,kCAAkC,EAClC,6BAA6B,EAC7B,+BAA+B,EAC/B,+BAA+B,EAC/B,+BAA+B,EAC/B,4BAA4B,EAC5B,+BAA+B,EAC/B,oCAAoC,EACpC,0BAA0B,EAC1B,6BAA6B,EAC7B,sBAAsB,EACtB,mCAAmC,EACnC,2CAA2C,EAC3C,iCAAiC,GACjC,MAAM,8DAA8D,CAAA;AACrE,YAAY,EAAE,aAAa,EAAE,MAAM,qDAAqD,CAAA;AACxF,YAAY,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAA;AAChG,YAAY,EACX,eAAe,EACf,eAAe,EACf,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,0BAA0B,EAC1B,kBAAkB,EAClB,uBAAuB,GACvB,MAAM,gDAAgD,CAAA;AACvD,OAAO,EACN,KAAK,oBAAoB,EACzB,4BAA4B,GAC5B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACN,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,qBAAqB,GACrB,MAAM,4BAA4B,CAAA;AACnC,YAAY,EACX,qBAAqB,EACrB,iCAAiC,EACjC,8BAA8B,EAC9B,2BAA2B,EAC3B,iCAAiC,GACjC,MAAM,sBAAsB,CAAA;AAC7B,YAAY,EACX,sBAAsB,EACtB,+BAA+B,EAC/B,sBAAsB,EACtB,4BAA4B,EAC5B,4BAA4B,EAC5B,uBAAuB,EACvB,8BAA8B,EAC9B,2BAA2B,EAC3B,6BAA6B,EAC7B,+BAA+B,EAC/B,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,2BAA2B,EAC3B,kBAAkB,EAClB,sBAAsB,GACtB,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAA"}

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

@@ -88,6 +88,28 @@ export declare const customBlockOptionFilterOperatorSchema: v.UnionSchema<[v.Str
     readonly is_not_empty: v.LiteralSchema<true, undefined>;
 }, undefined>], undefined>], undefined>;
 export type CustomBlockOptionFilterOperator = v.InferOutput<typeof customBlockOptionFilterOperatorSchema>;
+export declare const customBlockStatusGroupNameSchema: v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>;
+export type CustomBlockStatusGroupName = v.InferOutput<typeof customBlockStatusGroupNameSchema>;
+export declare const customBlockStatusGroupFilterOperatorSchema: v.UnionSchema<[v.StrictObjectSchema<{
+    readonly group_equals: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+}, undefined>, v.StrictObjectSchema<{
+    readonly group_does_not_equal: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+}, undefined>], undefined>;
+export type CustomBlockStatusGroupFilterOperator = v.InferOutput<typeof customBlockStatusGroupFilterOperatorSchema>;
+export declare const customBlockStatusFilterOperatorSchema: v.UnionSchema<[v.UnionSchema<[v.StrictObjectSchema<{
+    readonly equals: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
+}, undefined>, v.StrictObjectSchema<{
+    readonly does_not_equal: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
+}, undefined>, v.UnionSchema<[v.StrictObjectSchema<{
+    readonly is_empty: v.LiteralSchema<true, undefined>;
+}, undefined>, v.StrictObjectSchema<{
+    readonly is_not_empty: v.LiteralSchema<true, undefined>;
+}, undefined>], undefined>], undefined>, v.UnionSchema<[v.StrictObjectSchema<{
+    readonly group_equals: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+}, undefined>, v.StrictObjectSchema<{
+    readonly group_does_not_equal: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+}, undefined>], undefined>], undefined>;
+export type CustomBlockStatusFilterOperator = v.InferOutput<typeof customBlockStatusFilterOperatorSchema>;
 export declare const customBlockContainsFilterOperatorSchema: v.UnionSchema<[v.StrictObjectSchema<{
     readonly contains: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
 }, undefined>, v.StrictObjectSchema<{
@@ -280,7 +302,7 @@ export declare const resolvedCustomBlockDataSourcePropertyFilterSchema: v.UnionS
     }, undefined>], undefined>], undefined>;
 }, undefined>, v.StrictObjectSchema<{
     readonly propertyId: v.StringSchema<undefined>;
-    readonly status: v.UnionSchema<[v.StrictObjectSchema<{
+    readonly status: v.UnionSchema<[v.UnionSchema<[v.StrictObjectSchema<{
         readonly equals: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
     }, undefined>, v.StrictObjectSchema<{
         readonly does_not_equal: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
@@ -288,6 +310,10 @@ export declare const resolvedCustomBlockDataSourcePropertyFilterSchema: v.UnionS
         readonly is_empty: v.LiteralSchema<true, undefined>;
     }, undefined>, v.StrictObjectSchema<{
         readonly is_not_empty: v.LiteralSchema<true, undefined>;
+    }, undefined>], undefined>], undefined>, v.UnionSchema<[v.StrictObjectSchema<{
+        readonly group_equals: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+    }, undefined>, v.StrictObjectSchema<{
+        readonly group_does_not_equal: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
     }, undefined>], undefined>], undefined>;
 }, undefined>, v.StrictObjectSchema<{
     readonly propertyId: v.StringSchema<undefined>;
@@ -489,7 +515,7 @@ export declare const resolvedCustomBlockDataSourceFilterSchema: v.UnionSchema<[v
     }, undefined>], undefined>], undefined>;
 }, undefined>, v.StrictObjectSchema<{
     readonly propertyId: v.StringSchema<undefined>;
-    readonly status: v.UnionSchema<[v.StrictObjectSchema<{
+    readonly status: v.UnionSchema<[v.UnionSchema<[v.StrictObjectSchema<{
         readonly equals: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
     }, undefined>, v.StrictObjectSchema<{
         readonly does_not_equal: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
@@ -497,6 +523,10 @@ export declare const resolvedCustomBlockDataSourceFilterSchema: v.UnionSchema<[v
         readonly is_empty: v.LiteralSchema<true, undefined>;
     }, undefined>, v.StrictObjectSchema<{
         readonly is_not_empty: v.LiteralSchema<true, undefined>;
+    }, undefined>], undefined>], undefined>, v.UnionSchema<[v.StrictObjectSchema<{
+        readonly group_equals: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+    }, undefined>, v.StrictObjectSchema<{
+        readonly group_does_not_equal: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
     }, undefined>], undefined>], undefined>;
 }, undefined>, v.StrictObjectSchema<{
     readonly propertyId: v.StringSchema<undefined>;
@@ -697,7 +727,7 @@ export declare const resolvedCustomBlockDataSourceFilterSchema: v.UnionSchema<[v
         }, undefined>], undefined>], undefined>;
     }, undefined>, v.StrictObjectSchema<{
         readonly propertyId: v.StringSchema<undefined>;
-        readonly status: v.UnionSchema<[v.StrictObjectSchema<{
+        readonly status: v.UnionSchema<[v.UnionSchema<[v.StrictObjectSchema<{
             readonly equals: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
         }, undefined>, v.StrictObjectSchema<{
             readonly does_not_equal: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
@@ -705,6 +735,10 @@ export declare const resolvedCustomBlockDataSourceFilterSchema: v.UnionSchema<[v
             readonly is_empty: v.LiteralSchema<true, undefined>;
         }, undefined>, v.StrictObjectSchema<{
             readonly is_not_empty: v.LiteralSchema<true, undefined>;
+        }, undefined>], undefined>], undefined>, v.UnionSchema<[v.StrictObjectSchema<{
+            readonly group_equals: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+        }, undefined>, v.StrictObjectSchema<{
+            readonly group_does_not_equal: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
         }, undefined>], undefined>], undefined>;
     }, undefined>, v.StrictObjectSchema<{
         readonly propertyId: v.StringSchema<undefined>;
@@ -930,7 +964,7 @@ export declare const queryDataSourceMessageSchema: v.ObjectSchema<{
         }, undefined>], undefined>], undefined>;
     }, undefined>, v.StrictObjectSchema<{
         readonly propertyId: v.StringSchema<undefined>;
-        readonly status: v.UnionSchema<[v.StrictObjectSchema<{
+        readonly status: v.UnionSchema<[v.UnionSchema<[v.StrictObjectSchema<{
             readonly equals: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
         }, undefined>, v.StrictObjectSchema<{
             readonly does_not_equal: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
@@ -938,6 +972,10 @@ export declare const queryDataSourceMessageSchema: v.ObjectSchema<{
             readonly is_empty: v.LiteralSchema<true, undefined>;
         }, undefined>, v.StrictObjectSchema<{
             readonly is_not_empty: v.LiteralSchema<true, undefined>;
+        }, undefined>], undefined>], undefined>, v.UnionSchema<[v.StrictObjectSchema<{
+            readonly group_equals: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+        }, undefined>, v.StrictObjectSchema<{
+            readonly group_does_not_equal: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
         }, undefined>], undefined>], undefined>;
     }, undefined>, v.StrictObjectSchema<{
         readonly propertyId: v.StringSchema<undefined>;
@@ -1138,7 +1176,7 @@ export declare const queryDataSourceMessageSchema: v.ObjectSchema<{
             }, undefined>], undefined>], undefined>;
         }, undefined>, v.StrictObjectSchema<{
             readonly propertyId: v.StringSchema<undefined>;
-            readonly status: v.UnionSchema<[v.StrictObjectSchema<{
+            readonly status: v.UnionSchema<[v.UnionSchema<[v.StrictObjectSchema<{
                 readonly equals: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
             }, undefined>, v.StrictObjectSchema<{
                 readonly does_not_equal: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
@@ -1146,6 +1184,10 @@ export declare const queryDataSourceMessageSchema: v.ObjectSchema<{
                 readonly is_empty: v.LiteralSchema<true, undefined>;
             }, undefined>, v.StrictObjectSchema<{
                 readonly is_not_empty: v.LiteralSchema<true, undefined>;
+            }, undefined>], undefined>], undefined>, v.UnionSchema<[v.StrictObjectSchema<{
+                readonly group_equals: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+            }, undefined>, v.StrictObjectSchema<{
+                readonly group_does_not_equal: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
             }, undefined>], undefined>], undefined>;
         }, undefined>, v.StrictObjectSchema<{
             readonly propertyId: v.StringSchema<undefined>;

package/dist/protocol/messages/queryDataSource.js

@@ -55,6 +55,27 @@ export const customBlockOptionFilterOperatorSchema = v.union([
     v.strictObject({ does_not_equal: stringOrStringArraySchema }),
     emptyOperatorSchema,
 ]);
+export const customBlockStatusGroupNameSchema = v.picklist([
+    "To-do",
+    "In progress",
+    "Complete",
+    "Current",
+    "Future",
+]);
+const customBlockStatusGroupFilterValueSchema = v.union([
+    customBlockStatusGroupNameSchema,
+    v.pipe(v.array(customBlockStatusGroupNameSchema), v.minLength(1), v.maxLength(5)),
+]);
+export const customBlockStatusGroupFilterOperatorSchema = v.union([
+    v.strictObject({ group_equals: customBlockStatusGroupFilterValueSchema }),
+    v.strictObject({
+        group_does_not_equal: customBlockStatusGroupFilterValueSchema,
+    }),
+]);
+export const customBlockStatusFilterOperatorSchema = v.union([
+    customBlockOptionFilterOperatorSchema,
+    customBlockStatusGroupFilterOperatorSchema,
+]);
 export const customBlockContainsFilterOperatorSchema = v.union([
     v.strictObject({ contains: stringOrStringArraySchema }),
     v.strictObject({ contains_all: stringOrStringArraySchema }),
@@ -112,7 +133,7 @@ export const resolvedCustomBlockDataSourcePropertyFilterSchema = v.union([
     }),
     v.strictObject({
         propertyId: v.string(),
-        status: customBlockOptionFilterOperatorSchema,
+        status: customBlockStatusFilterOperatorSchema,
     }),
     v.strictObject({
         propertyId: v.string(),

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

@@ -222,7 +222,7 @@ export declare const sandboxToHostMessageSchema: v.VariantSchema<"type", [v.Vari
         }, undefined>], undefined>], undefined>;
     }, undefined>, v.StrictObjectSchema<{
         readonly propertyId: v.StringSchema<undefined>;
-        readonly status: v.UnionSchema<[v.StrictObjectSchema<{
+        readonly status: v.UnionSchema<[v.UnionSchema<[v.StrictObjectSchema<{
             readonly equals: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
         }, undefined>, v.StrictObjectSchema<{
             readonly does_not_equal: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
@@ -230,6 +230,10 @@ export declare const sandboxToHostMessageSchema: v.VariantSchema<"type", [v.Vari
             readonly is_empty: v.LiteralSchema<true, undefined>;
         }, undefined>, v.StrictObjectSchema<{
             readonly is_not_empty: v.LiteralSchema<true, undefined>;
+        }, undefined>], undefined>], undefined>, v.UnionSchema<[v.StrictObjectSchema<{
+            readonly group_equals: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+        }, undefined>, v.StrictObjectSchema<{
+            readonly group_does_not_equal: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
         }, undefined>], undefined>], undefined>;
     }, undefined>, v.StrictObjectSchema<{
         readonly propertyId: v.StringSchema<undefined>;
@@ -430,7 +434,7 @@ export declare const sandboxToHostMessageSchema: v.VariantSchema<"type", [v.Vari
             }, undefined>], undefined>], undefined>;
         }, undefined>, v.StrictObjectSchema<{
             readonly propertyId: v.StringSchema<undefined>;
-            readonly status: v.UnionSchema<[v.StrictObjectSchema<{
+            readonly status: v.UnionSchema<[v.UnionSchema<[v.StrictObjectSchema<{
                 readonly equals: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
             }, undefined>, v.StrictObjectSchema<{
                 readonly does_not_equal: v.UnionSchema<[v.StringSchema<undefined>, v.ArraySchema<v.StringSchema<undefined>, undefined>], undefined>;
@@ -438,6 +442,10 @@ export declare const sandboxToHostMessageSchema: v.VariantSchema<"type", [v.Vari
                 readonly is_empty: v.LiteralSchema<true, undefined>;
             }, undefined>, v.StrictObjectSchema<{
                 readonly is_not_empty: v.LiteralSchema<true, undefined>;
+            }, undefined>], undefined>], undefined>, v.UnionSchema<[v.StrictObjectSchema<{
+                readonly group_equals: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
+            }, undefined>, v.StrictObjectSchema<{
+                readonly group_does_not_equal: v.UnionSchema<[v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, v.SchemaWithPipe<readonly [v.ArraySchema<v.PicklistSchema<["To-do", "In progress", "Complete", "Current", "Future"], undefined>, undefined>, v.MinLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 1, undefined>, v.MaxLengthAction<("Complete" | "Current" | "Future" | "In progress" | "To-do")[], 5, undefined>]>], undefined>;
             }, undefined>], undefined>], undefined>;
         }, undefined>, v.StrictObjectSchema<{
             readonly propertyId: v.StringSchema<undefined>;

package/dist/queries/querySubscriptions.d.ts

@@ -12,7 +12,8 @@ export declare class QuerySubscriptions {
     subscribe(message: QueryDataSourceMessage): QuerySubscriptionToken;
     isCurrent(subscriptionId: string, token: QuerySubscriptionToken): boolean;
     unsubscribe(subscriptionId: string): void;
-    refresh(dataSourceId: NotionDataSourceId): QueryRefresh[];
+    refresh(dataSourceId: NotionDataSourceId): QueryRefresh[] | undefined;
+    finish(subscriptionId: string, token: QuerySubscriptionToken): QueryRefresh | undefined;
     unsubscribeAll(): void;
 }
 //# sourceMappingURL=querySubscriptions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"querySubscriptions.d.ts","sourceRoot":"","sources":["../../src/queries/querySubscriptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AACjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AAE1G,MAAM,MAAM,YAAY,GAAG;IAC1B,OAAO,EAAE,sBAAsB,CAAA;IAC/B,KAAK,EAAE,sBAAsB,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACpC,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAA;CACvC,CAAA;AAOD,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA4C;IAE7E,SAAS,CAAC,OAAO,EAAE,sBAAsB,GAAG,sBAAsB,CASjE;IAED,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAExE;IAED,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAExC;IAED,OAAO,CAAC,YAAY,EAAE,kBAAkB,GAAG,YAAY,EAAE,CAgBxD;IAED,cAAc,SAEb;CACD"}
+{"version":3,"file":"querySubscriptions.d.ts","sourceRoot":"","sources":["../../src/queries/querySubscriptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AACjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AAE1G,MAAM,MAAM,YAAY,GAAG;IAC1B,OAAO,EAAE,sBAAsB,CAAA;IAC/B,KAAK,EAAE,sBAAsB,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACpC,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAA;CACvC,CAAA;AASD,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA4C;IAE7E,SAAS,CAAC,OAAO,EAAE,sBAAsB,GAAG,sBAAsB,CAWjE;IAED,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAExE;IAED,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAExC;IAED,OAAO,CAAC,YAAY,EAAE,kBAAkB,GAAG,YAAY,EAAE,GAAG,SAAS,CAmBpE;IAED,MAAM,CACL,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,sBAAsB,GAC3B,YAAY,GAAG,SAAS,CAY1B;IAED,cAAc,SAEb;CACD"}

package/dist/queries/querySubscriptions.js

@@ -7,6 +7,8 @@ export class QuerySubscriptions {
         this.bySubscriptionId.set(message.subscriptionId, {
             message,
             token,
+            isRefreshing: true,
+            shouldRefreshAgain: false,
         });
         return token;
     }
@@ -18,20 +20,36 @@ export class QuerySubscriptions {
     }
     refresh(dataSourceId) {
         const refreshes = [];
+        let hasSubscriptions = false;
         for (const queryState of this.bySubscriptionId.values()) {
             if (queryState.message.dataSourceId !== dataSourceId) {
                 continue;
             }
-            const token = {
-                _tag: "QuerySubscriptionToken",
-            };
-            queryState.token = token;
+            hasSubscriptions = true;
+            if (queryState.isRefreshing) {
+                queryState.shouldRefreshAgain = true;
+                continue;
+            }
+            queryState.isRefreshing = true;
             refreshes.push({
                 message: queryState.message,
-                token,
+                token: queryState.token,
             });
         }
-        return refreshes;
+        return hasSubscriptions ? refreshes : undefined;
+    }
+    finish(subscriptionId, token) {
+        const state = this.bySubscriptionId.get(subscriptionId);
+        if (state?.token !== token) {
+            return undefined;
+        }
+        state.isRefreshing = false;
+        if (!state.shouldRefreshAgain) {
+            return undefined;
+        }
+        state.shouldRefreshAgain = false;
+        state.isRefreshing = true;
+        return { message: state.message, token: state.token };
     }
     unsubscribeAll() {
         this.bySubscriptionId.clear();

package/dist/queries/validateQueryDataSourceFilter.js

@@ -29,6 +29,23 @@ function validatePropertyFilter(filter, collectionSchema) {
             isRetryable: false,
         };
     }
+    if ("status" in filter && propertySchema.type === "status") {
+        const operator = filter.status;
+        if ("group_equals" in operator || "group_does_not_equal" in operator) {
+            const value = "group_equals" in operator
+                ? operator.group_equals
+                : operator.group_does_not_equal;
+            const names = Array.isArray(value) ? value : [value];
+            const unknownName = names.find(name => !propertySchema.groups.some(group => group.name === name));
+            return unknownName === undefined
+                ? undefined
+                : {
+                    code: "invalid_data_source_query_filter",
+                    message: `Unknown status group "${unknownName}".`,
+                    isRetryable: false,
+                };
+        }
+    }
     const optionFilter = getOptionFilter(filter);
     if (optionFilter === undefined ||
         propertySchema.type !== optionFilter.propertyType) {
@@ -53,7 +70,10 @@ function getOptionFilter(filter) {
         return { propertyType: "multi_select", operator: filter.multi_select };
     }
     if ("status" in filter) {
-        return { propertyType: "status", operator: filter.status };
+        const operator = filter.status;
+        return "group_equals" in operator || "group_does_not_equal" in operator
+            ? undefined
+            : { propertyType: "status", operator };
     }
     return undefined;
 }

package/package.json

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

package/src/createCustomBlockHost.ts

@@ -247,28 +247,35 @@ export function createCustomBlockHost(
 		message: QueryDataSourceMessage,
 		token: QuerySubscriptionToken = querySubscriptions.subscribe(message),
 	) {
-		const collectionSchema = getCollectionSchema(
-			activeDataSources,
-			message.dataSourceId,
-		)
-		const queryError = getQueryValidationError(message, collectionSchema)
-		if (queryError !== undefined) {
-			if (querySubscriptions.isCurrent(message.subscriptionId, token)) {
-				postQueryDataSourceResult({
-					subscriptionId: message.subscriptionId,
-					response: { status: "error", error: queryError },
-				})
+		try {
+			const collectionSchema = getCollectionSchema(
+				activeDataSources,
+				message.dataSourceId,
+			)
+			const queryError = getQueryValidationError(message, collectionSchema)
+			if (queryError !== undefined) {
+				if (querySubscriptions.isCurrent(message.subscriptionId, token)) {
+					postQueryDataSourceResult({
+						subscriptionId: message.subscriptionId,
+						response: { status: "error", error: queryError },
+					})
+				}
+				return
+			}
+			const response = await handlers.queryDataSource(message)
+			if (!querySubscriptions.isCurrent(message.subscriptionId, token)) {
+				return
+			}
+			postQueryDataSourceResult({
+				subscriptionId: message.subscriptionId,
+				response,
+			})
+		} finally {
+			const refresh = querySubscriptions.finish(message.subscriptionId, token)
+			if (refresh !== undefined) {
+				void handleQuery(refresh.message, refresh.token)
 			}
-			return
-		}
-		const response = await handlers.queryDataSource(message)
-		if (!querySubscriptions.isCurrent(message.subscriptionId, token)) {
-			return
 		}
-		postQueryDataSourceResult({
-			subscriptionId: message.subscriptionId,
-			response,
-		})
 	}
 
 	function updateHostState(update: HostStateUpdates) {
@@ -487,7 +494,7 @@ export function createCustomBlockHost(
 				dataSourceId,
 			)
 			const refreshes = querySubscriptions.refresh(normalizedDataSourceId)
-			if (refreshes.length === 0) {
+			if (refreshes === undefined) {
 				emit("warn", `No active query exists for data source "${dataSourceId}"`)
 				return
 			}

package/src/index.ts

@@ -13,6 +13,9 @@ export type {
 	CustomBlockOptionFilterOperator,
 	CustomBlockPeopleFilterOperator,
 	CustomBlockPersonFilterValue,
+	CustomBlockStatusFilterOperator,
+	CustomBlockStatusGroupFilterOperator,
+	CustomBlockStatusGroupName,
 	CustomBlockTextFilterOperator,
 	QueryDataSourceMessage,
 	ResolvedCustomBlockDataSourceFilter,

package/src/queries/querySubscriptions.ts

@@ -13,6 +13,8 @@ export type QuerySubscriptionToken = {
 type QuerySubscriptionState = {
 	message: QueryDataSourceMessage
 	token: QuerySubscriptionToken
+	isRefreshing: boolean
+	shouldRefreshAgain: boolean
 }
 
 export class QuerySubscriptions {
@@ -25,6 +27,8 @@ export class QuerySubscriptions {
 		this.bySubscriptionId.set(message.subscriptionId, {
 			message,
 			token,
+			isRefreshing: true,
+			shouldRefreshAgain: false,
 		})
 		return token
 	}
@@ -37,22 +41,42 @@ export class QuerySubscriptions {
 		this.bySubscriptionId.delete(subscriptionId)
 	}
 
-	refresh(dataSourceId: NotionDataSourceId): QueryRefresh[] {
+	refresh(dataSourceId: NotionDataSourceId): QueryRefresh[] | undefined {
 		const refreshes: QueryRefresh[] = []
+		let hasSubscriptions = false
 		for (const queryState of this.bySubscriptionId.values()) {
 			if (queryState.message.dataSourceId !== dataSourceId) {
 				continue
 			}
-			const token: QuerySubscriptionToken = {
-				_tag: "QuerySubscriptionToken",
+			hasSubscriptions = true
+			if (queryState.isRefreshing) {
+				queryState.shouldRefreshAgain = true
+				continue
 			}
-			queryState.token = token
+			queryState.isRefreshing = true
 			refreshes.push({
 				message: queryState.message,
-				token,
+				token: queryState.token,
 			})
 		}
-		return refreshes
+		return hasSubscriptions ? refreshes : undefined
+	}
+
+	finish(
+		subscriptionId: string,
+		token: QuerySubscriptionToken,
+	): QueryRefresh | undefined {
+		const state = this.bySubscriptionId.get(subscriptionId)
+		if (state?.token !== token) {
+			return undefined
+		}
+		state.isRefreshing = false
+		if (!state.shouldRefreshAgain) {
+			return undefined
+		}
+		state.shouldRefreshAgain = false
+		state.isRefreshing = true
+		return { message: state.message, token: state.token }
 	}
 
 	unsubscribeAll() {

package/src/queries/validateQueryDataSourceFilter.ts

@@ -52,6 +52,27 @@ function validatePropertyFilter(
 		}
 	}
 
+	if ("status" in filter && propertySchema.type === "status") {
+		const operator = filter.status
+		if ("group_equals" in operator || "group_does_not_equal" in operator) {
+			const value =
+				"group_equals" in operator
+					? operator.group_equals
+					: operator.group_does_not_equal
+			const names = Array.isArray(value) ? value : [value]
+			const unknownName = names.find(
+				name => !propertySchema.groups.some(group => group.name === name),
+			)
+			return unknownName === undefined
+				? undefined
+				: {
+						code: "invalid_data_source_query_filter",
+						message: `Unknown status group "${unknownName}".`,
+						isRetryable: false,
+					}
+		}
+	}
+
 	const optionFilter = getOptionFilter(filter)
 	if (
 		optionFilter === undefined ||
@@ -88,7 +109,10 @@ function getOptionFilter(filter: ResolvedCustomBlockDataSourcePropertyFilter):
 		return { propertyType: "multi_select", operator: filter.multi_select }
 	}
 	if ("status" in filter) {
-		return { propertyType: "status", operator: filter.status }
+		const operator = filter.status
+		return "group_equals" in operator || "group_does_not_equal" in operator
+			? undefined
+			: { propertyType: "status", operator }
 	}
 	return undefined
 }