@contember/bindx-react 0.1.4 → 0.1.10

package/src/index.ts

@@ -186,15 +186,15 @@ export type {
 	BindxContextValue,
 	UseEntityOptions,
 	UseEntityListOptions,
-	LoadingEntityAccessor,
-	ErrorEntityAccessor,
-	NotFoundEntityAccessor,
-	ReadyEntityAccessor,
-	EntityAccessorResult,
-	LoadingEntityListAccessor,
-	ErrorEntityListAccessor,
-	ReadyEntityListAccessor,
-	EntityListAccessorResult,
+	LoadingEntityResult,
+	ErrorEntityResult,
+	NotFoundEntityResult,
+	ReadyEntityResult,
+	UseEntityResult,
+	LoadingEntityListResult,
+	ErrorEntityListResult,
+	ReadyEntityListResult,
+	UseEntityListResult,
 	// Persistence hook types
 	PersistApi,
 	EntityPersistApi,

package/src/jsx/collectorProxy.ts

@@ -47,6 +47,7 @@ export function createCollectorProxy<T>(
 		$fields: fieldsProxy,
 		$data: null,
 		$isDirty: false,
+		$isPersisting: false,
 		$persistedId: null,
 		$isNew: true,
 		__entityType: undefined as unknown as T,
@@ -226,6 +227,7 @@ function createCollectorFieldRef(
 		// EntityRef-compatible properties (for HasOneAccessor = EntityAccessor compatibility)
 		id: placeholderId,
 		$data: null,
+		$isPersisting: false,
 		$isNew: false,
 		$persistedId: null,
 		__entityName: targetEntityName ?? '',

package/src/jsx/components/Entity.tsx

@@ -106,18 +106,19 @@ function EntityByMode({
 	})
 
 	// Render based on status
-	if (result.status === 'loading') {
+	if (result.$status === 'loading') {
 		return <>{loading ?? <DefaultLoading />}</>
 	}
 
-	if (result.status === 'error') {
+	if (result.$status === 'error') {
+		const error: FieldError = result.$error ?? { source: 'load', message: 'Unknown error', category: 'unknown', retryable: false }
 		if (errorFallback) {
-			return <>{errorFallback(result.error)}</>
+			return <>{errorFallback(error)}</>
 		}
-		return <DefaultError error={result.error} />
+		return <DefaultError error={error} />
 	}
 
-	if (result.status === 'not_found') {
+	if (result.$status === 'not_found') {
 		return <>{notFound ?? <DefaultNotFound entityType={entityType} by={by} />}</>
 	}
 
@@ -271,14 +272,19 @@ function EntityHandleRenderer({
 
 	const version = useSyncExternalStore(subscribe, getSnapshot, getSnapshot)
 
-	const handle = useMemo(
-		() => EntityHandle.create(entityId, entityType, store, dispatcher, schemaRegistry, undefined, selection),
+	const rawHandle = useMemo(
+		() => EntityHandle.createRaw(entityId, entityType, store, dispatcher, schemaRegistry, undefined, selection),
 		[entityId, entityType, store, dispatcher, schemaRegistry, selection, version],
 	)
 
-	useEffect(() => () => { handle.dispose() }, [handle])
+	const handle = useMemo(
+		() => EntityHandle.wrapProxy(rawHandle),
+		[rawHandle],
+	)
+
+	useEffect(() => () => { rawHandle.dispose() }, [rawHandle])
 
-	return <>{children(handle as unknown as EntityAccessor<unknown>)}</>
+	return <>{children(handle as EntityAccessor<unknown>)}</>
 }
 
 // ==================== Main Entity Component ====================

package/src/jsx/components/EntityList.tsx

@@ -86,15 +86,15 @@ function EntityListComponent<TRoleMap extends Record<string, object>>({
 	})
 
 	// Render based on status
-	if (result.status === 'loading') {
+	if (result.$status === 'loading') {
 		return <>{loading ?? <DefaultLoading />}</>
 	}
 
-	if (result.status === 'error') {
+	if (result.$status === 'error') {
 		if (errorFallback) {
-			return <>{errorFallback(result.error)}</>
+			return <>{errorFallback(result.$error)}</>
 		}
-		return <DefaultError error={result.error} />
+		return <DefaultError error={result.$error} />
 	}
 
 	// Empty state
@@ -103,7 +103,7 @@ function EntityListComponent<TRoleMap extends Record<string, object>>({
 	}
 
 	// Phase 3: Runtime render — items are already EntityAccessors from the hook
-	const items = result.items.map((item, index) => {
+	const items = result.items.map((item: (typeof result.items)[number], index: number) => {
 		return (
 			<React.Fragment key={item.id}>
 				{children(item as unknown as EntityAccessor<CommonEntity<TRoleMap>>, index)}