refactor: expose graphQlClient in bindx context for S3 uploader

Replace hacky type assertion in useS3Client with proper context-based
access. Introduces BindxGraphQlClient interface to avoid cross-package
coupling to concrete GraphQlClient class.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: matej21

packages/bindx-react/src/hooks/BackendAdapterContext.tsx

@@ -8,6 +8,14 @@ import { SchemaRegistry } from '@contember/bindx'
 import { UndoManager } from '@contember/bindx'
 import { QueryBatcher } from '../batching/QueryBatcher.js'
 
+/**
+ * Minimal GraphQL client interface exposed through bindx context.
+ * Avoids coupling to concrete GraphQlClient class across package boundaries.
+ */
+export interface BindxGraphQlClient {
+	execute<T = unknown>(query: string, options?: { variables?: Record<string, unknown> }): Promise<T>
+}
+
 /**
  * Context value containing all bindx services
  */
@@ -26,6 +34,8 @@ export interface BindxContextValue {
 	schema: SchemaRegistry
 	/** Undo manager (if enabled) */
 	undoManager: UndoManager | null
+	/** GraphQL client (available when using ContemberBindxProvider) */
+	graphQlClient: BindxGraphQlClient | null
 	/** Whether debug logging is enabled */
 	debug: boolean
 }
@@ -122,6 +132,7 @@ export function BindxProvider({
 			batchPersister,
 			schema: schemaRegistry,
 			undoManager,
+			graphQlClient: null,
 			debug,
 		}
 	}, [adapter, customStore, schemaDefinition, customMutationCollector, enableUndo, undoConfig, defaultUpdateMode, debug])

packages/bindx-react/src/hooks/ContemberBindxProvider.tsx

@@ -140,6 +140,7 @@ export const ContemberBindxProvider = memo(function ContemberBindxProvider({
 			batchPersister,
 			schema: schemaRegistry,
 			undoManager,
+			graphQlClient,
 			debug,
 		}
 	}, [schema, customStore, undoManagerProp, undoConfig, defaultUpdateMode, debug])

packages/bindx-react/src/hooks/index.ts

@@ -8,6 +8,7 @@ export {
 	useSchemaRegistry,
 	type BindxProviderProps,
 	type BindxContextValue,
+	type BindxGraphQlClient,
 } from './BackendAdapterContext.js'
 
 export {

packages/bindx-react/src/index.ts

@@ -184,6 +184,7 @@ export {
 export type {
 	BindxProviderProps,
 	BindxContextValue,
+	BindxGraphQlClient,
 	UseEntityOptions,
 	UseEntityListOptions,
 	LoadingEntityResult,

packages/bindx-uploader/package.json

@@ -18,7 +18,6 @@
 		"@contember/bindx": "workspace:*",
 		"@contember/bindx-react": "workspace:*",
 		"@contember/bindx-repeater": "workspace:*",
-		"@contember/graphql-client": "*",
 		"@radix-ui/react-slot": "^1.2.3",
 		"react-dropzone": "^14.3.8"
 	},

packages/bindx-uploader/src/hooks/useS3Client.ts

@@ -4,23 +4,20 @@ import { S3UploadClient, type S3UploadClientOptions } from '../uploadClient/S3Up
 import { createContentApiS3Signer } from '../utils/urlSigner.js'
 
 /**
- * Creates an S3 upload client using the current Contember GraphQL client.
- * Uses the bindx context to get the GraphQL client for URL signing.
+ * Creates an S3 upload client using the GraphQL client from bindx context.
+ * Requires ContemberBindxProvider (which provides graphQlClient).
  */
 export const useS3Client = (options: Partial<S3UploadClientOptions> = {}): S3UploadClient => {
-	const { adapter } = useBindxContext()
+	const { graphQlClient } = useBindxContext()
 
 	return useMemo(() => {
-		// Get the GraphQL client from the adapter
-		// ContemberAdapter has a graphQlClient property
-		const graphQlClient = (adapter as { graphQlClient?: { execute: (query: string, options?: unknown) => Promise<unknown> } }).graphQlClient
 		if (!graphQlClient) {
-			throw new Error('useS3Client requires a Contember adapter with GraphQL client')
+			throw new Error('useS3Client requires ContemberBindxProvider (graphQlClient not available in context)')
 		}
 
 		return new S3UploadClient({
-			signUrl: createContentApiS3Signer(graphQlClient as Parameters<typeof createContentApiS3Signer>[0]),
+			signUrl: createContentApiS3Signer(graphQlClient),
 			...options,
 		})
-	}, [adapter, options])
+	}, [graphQlClient, options])
 }

packages/bindx-uploader/src/utils/urlSigner.ts

@@ -1,12 +1,12 @@
-import type { GraphQlClient } from '@contember/graphql-client'
+import type { BindxGraphQlClient } from '@contember/bindx-react'
 import type { S3FileParameters, S3SignedUrlResponse } from '../uploadClient/types.js'
 
 /**
  * Creates an S3 URL signer that batches requests to reduce API calls.
  * Uses microtask scheduling to batch concurrent signing requests into a single GraphQL mutation.
  */
 export const createContentApiS3Signer = (
-	client: GraphQlClient,
+	client: BindxGraphQlClient,
 ): ((parameters: S3FileParameters) => Promise<S3SignedUrlResponse>) => {
 	let uploadUrlBatchParameters: S3FileParameters[] = []
 	let uploadUrlBatchResult: null | Promise<Record<string, S3SignedUrlResponse>> = null