Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
perf(database): share the block load's schema read with the mounted view (#9413)
Wolf Mermelstein8a0d362a99ce
diff --git a/apps/web/src/features/block-database/queries/load-database.test.ts b/apps/web/src/features/block-database/queries/load-database.test.tsindex c000252d79..4e886facae 100644--- a/apps/web/src/features/block-database/queries/load-database.test.ts+++ b/apps/web/src/features/block-database/queries/load-database.test.ts@@ -1,15 +1,15 @@-import { ok } from 'neverthrow';+import { okAsync } from 'neverthrow';import { expect, it, vi } from 'vitest';import { loadDatabase } from './load-database';const get = vi.hoisted(() => vi.fn());-vi.mock('@service-storage/client', () => ({- storageServiceClient: { databases: { get } },+vi.mock('@queries/storage/databases', () => ({+ fetchDatabaseDetail: get,}));it('gives the block the viewer grant as its access level', async () => {- get.mockResolvedValue(- ok({+ get.mockReturnValue(+ okAsync({database: {id: 'database-id',name: 'Guests',@@ -23,5 +23,5 @@ it('gives the block the viewer grant as its access level', async () => {);const result = await loadDatabase('database-id');expect(result._unsafeUnwrap().userAccessLevel).toBe('owner');- expect(get).toHaveBeenCalledWith({ id: 'database-id' });+ expect(get).toHaveBeenCalledWith('database-id');});diff --git a/apps/web/src/features/block-database/queries/load-database.ts b/apps/web/src/features/block-database/queries/load-database.tsindex ffef31967e..006da75671 100644--- a/apps/web/src/features/block-database/queries/load-database.ts+++ b/apps/web/src/features/block-database/queries/load-database.ts@@ -1,4 +1,4 @@-import { storageServiceClient } from '@service-storage/client';+import { fetchDatabaseDetail } from '@queries/storage/databases';import type { AccessLevel } from '@service-storage/generated/schemas/accessLevel';import type { DatabaseDetail } from '@service-storage/generated/schemas/databaseDetail';@@ -7,8 +7,7 @@ type LoadedDatabase = DatabaseDetail & { userAccessLevel: AccessLevel };/** Load transport only when opening a database, not while discovering block types. */export async function loadDatabase(id: string) {- const result = await storageServiceClient.databases.get({ id });- return result.map(+ return await fetchDatabaseDetail(id).map((detail): LoadedDatabase => ({ ...detail, userAccessLevel: detail.grant }));}diff --git a/apps/web/src/lib/queries/storage/databases.test.ts b/apps/web/src/lib/queries/storage/databases.test.tsindex 52dbad11c6..62afa9ddb2 100644--- a/apps/web/src/lib/queries/storage/databases.test.ts+++ b/apps/web/src/lib/queries/storage/databases.test.ts@@ -1,12 +1,14 @@+import { loadDatabase } from '@app/features/block-database/queries/load-database';import type { DatabaseOp } from '@core/database-sql/generated/types';import { queryClient } from '@queries/client';import type { DatabaseDetail } from '@service-storage/generated/schemas/databaseDetail';-import { errAsync, okAsync } from 'neverthrow';+import { errAsync, okAsync, ResultAsync } from 'neverthrow';import { afterEach, describe, expect, it, vi } from 'vitest';import {applyDatabaseOps,applyDatabaseTableVersions,createDatabase,+ databaseDetailQueryOptions,fetchViewerDatabases,onDatabaseBatchCommitted,} from './databases';@@ -723,3 +725,42 @@ it('does not hold a cell write while refreshing a newly minted option', async ()invalidate.mockRestore();}});++it('shares the block loader schema read with the mounted database view', async () => {+ mock.get.mockReturnValue(okAsync(detail));+ const loaded = await loadDatabase('db');+ expect(loaded.isOk()).toBe(true);+ const mounted = await queryClient.fetchQuery(+ databaseDetailQueryOptions('db')+ );+ expect(mounted).toEqual(detail);+ expect(mock.get).toHaveBeenCalledOnce();+});++it('deduplicates a block load with an in-flight schema read and reuses it on reopen', async () => {+ let finish!: (value: DatabaseDetail) => void;+ mock.get.mockReturnValue(+ ResultAsync.fromSafePromise(+ new Promise<DatabaseDetail>((resolve) => {+ finish = resolve;+ })+ )+ );+ const mounted = queryClient.fetchQuery(databaseDetailQueryOptions('db'));+ const loaded = loadDatabase('db');+ expect(mock.get).toHaveBeenCalledOnce();+ finish(detail);+ await mounted;+ expect((await loaded).isOk()).toBe(true);+ expect((await loadDatabase('db')).isOk()).toBe(true);+ expect(mock.get).toHaveBeenCalledOnce();+});++it('propagates a refused database load without seeding its schema cache', async () => {+ const errors = [{ code: 'FORBIDDEN', message: 'Access denied' }];+ mock.get.mockReturnValue(errAsync(errors));+ const loaded = await loadDatabase('db');+ expect(loaded.isErr()).toBe(true);+ expect(loaded._unsafeUnwrapErr()).toEqual(errors);+ expect(queryClient.getQueryData(key)).toBeUndefined();+});diff --git a/apps/web/src/lib/queries/storage/databases.ts b/apps/web/src/lib/queries/storage/databases.tsindex ded1e20883..daa3dbd117 100644--- a/apps/web/src/lib/queries/storage/databases.ts+++ b/apps/web/src/lib/queries/storage/databases.ts@@ -111,6 +111,13 @@ function fetchCached<Data>(options: {return new ResultAsync(catchToResult(() => queryClient.fetchQuery(options)));}+/** Share the initial block load with the mounted view's schema query. */+export function fetchDatabaseDetail(+ id: string+): ResultAsync<DatabaseDetail, ResultError[]> {+ return fetchCached(databaseDetailQueryOptions(id));+}+/** {@link useViewerDatabases}, read once. */export function fetchViewerDatabases(): ResultAsync<DatabaseDetail[],