@contember/bindx-uploader 0.1.13 → 0.1.15

package/dist/components/MultiUploader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MultiUploader.d.ts","sourceRoot":"","sources":["../../src/components/MultiUploader.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AACpE,OAAO,KAAK,EAAa,UAAU,EAAqC,MAAM,kBAAkB,CAAA;AAEhG,OAAO,EAAE,eAAe,EAAE,KAAK,iBAAiB,EAAwB,MAAM,wBAAwB,CAAA;AACtG,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,aAAa,CAAA;AAa3D,MAAM,WAAW,kBAAkB,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACpE;;OAEG;IACH,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;IAC1B;;;OAGG;IACH,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC3B;;OAEG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAA;CACpB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EACtE,KAAK,EACL,QAAQ,EACR,QAAQ,GACR,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAgGzC;AA+BD,QAAA,MAAM,0BAA0B,EAAoB,OAAO,aAAa,GAAG,iBAAiB,GAAG;IAAE,CAAC,eAAe,CAAC,EAAE,IAAI,CAAA;CAAE,CAAA;AA2B1H,OAAO,EAAE,0BAA0B,IAAI,qBAAqB,EAAE,CAAA"}
+{"version":3,"file":"MultiUploader.d.ts","sourceRoot":"","sources":["../../src/components/MultiUploader.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AACpE,OAAO,KAAK,EAAa,UAAU,EAAqC,MAAM,kBAAkB,CAAA;AAEhG,OAAO,EAAE,eAAe,EAAE,KAAK,iBAAiB,EAAoC,MAAM,wBAAwB,CAAA;AAClH,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,aAAa,CAAA;AAa3D,MAAM,WAAW,kBAAkB,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACpE;;OAEG;IACH,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;IAC1B;;;OAGG;IACH,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC3B;;OAEG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAA;CACpB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EACtE,KAAK,EACL,QAAQ,EACR,QAAQ,GACR,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAiGzC;AA+BD,QAAA,MAAM,0BAA0B,EAAoB,OAAO,aAAa,GAAG,iBAAiB,GAAG;IAAE,CAAC,eAAe,CAAC,EAAE,IAAI,CAAA;CAAE,CAAA;AA2B1H,OAAO,EAAE,0BAA0B,IAAI,qBAAqB,EAAE,CAAA"}

package/dist/internal/hooks/useFillEntity.d.ts

@@ -1,12 +1,12 @@
-import type { EntityRef, HasOneRef } from '@contember/bindx';
+import type { EntityRef, HasOneAccessor } from '@contember/bindx';
 import type { FileType, UploaderEvents } from '../../types.js';
 export interface UseFillEntityArgs<TEntity = Record<string, unknown>> extends UploaderEvents {
     /**
      * The entity to fill. Can be:
      * - EntityRef: fill the entity directly
-     * - HasOneRef: fill the related entity (disconnect first on upload start)
+     * - HasOneAccessor: fill the related entity (disconnect first on upload start)
      */
-    entity: EntityRef<TEntity> | HasOneRef<TEntity>;
+    entity: EntityRef<TEntity> | HasOneAccessor<TEntity>;
     fileType: FileType<TEntity>;
 }
 /**

package/dist/internal/hooks/useFillEntity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFillEntity.d.ts","sourceRoot":"","sources":["../../../src/internal/hooks/useFillEntity.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAoB,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAIhF,MAAM,WAAW,iBAAiB,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAE,SAAQ,cAAc;IAC3F;;;;OAIG;IACH,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;IAC/C,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC3B;AAoBD;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,iCAIpE,iBAAiB,CAAC,OAAO,CAAC,KAAG,cA8C/B,CAAA"}
+{"version":3,"file":"useFillEntity.d.ts","sourceRoot":"","sources":["../../../src/internal/hooks/useFillEntity.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAoB,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAIhF,MAAM,WAAW,iBAAiB,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAE,SAAQ,cAAc;IAC3F;;;;OAIG;IACH,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;IACpD,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC3B;AAoBD;;;GAGG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,iCAIpE,iBAAiB,CAAC,OAAO,CAAC,KAAG,cA8C/B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@contember/bindx-uploader",
-	"version": "0.1.13",
+	"version": "0.1.15",
 	"description": "File upload components for bindx data binding",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -15,9 +15,9 @@
 		"react": ">=18.0.0"
 	},
 	"dependencies": {
-		"@contember/bindx": "0.1.13",
-		"@contember/bindx-react": "0.1.13",
-		"@contember/bindx-repeater": "0.1.13",
+		"@contember/bindx": "0.1.15",
+		"@contember/bindx-react": "0.1.15",
+		"@contember/bindx-repeater": "0.1.15",
 		"@radix-ui/react-slot": "^1.2.3",
 		"react-dropzone": "^14.3.8"
 	},

package/src/components/MultiUploader.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useMemo, useRef, type ReactNode } from 'react'
 import type { EntityRef, HasManyRef, SelectionFieldMeta, SelectionMeta } from '@contember/bindx'
 import { FIELD_REF_META } from '@contember/bindx'
-import { BINDX_COMPONENT, type SelectionProvider, createEmptySelection } from '@contember/bindx-react'
+import { BINDX_COMPONENT, type SelectionProvider, createEmptySelection, useHasMany } from '@contember/bindx-react'
 import type { FileType, UploaderEvents } from '../types.js'
 import {
 	MultiUploaderEntityToFileStateMapContext,
@@ -54,6 +54,7 @@ export function MultiUploader<TEntity extends Record<string, unknown>>({
 	fileType,
 	children,
 }: MultiUploaderProps<TEntity>): ReactNode {
+	const fieldAccessor = useHasMany(field)
 	// Map file ID -> entity ID
 	const fileToEntityMapRef = useRef(new Map<string, string>())
 	// Map entity ID -> file ID (for reverse lookup)
@@ -63,9 +64,9 @@ export function MultiUploader<TEntity extends Record<string, unknown>>({
 		(fileId: string): EntityRef<unknown> | undefined => {
 			const entityId = fileToEntityMapRef.current.get(fileId)
 			if (!entityId) return undefined
-			return field.items.find((item: { id: string }) => item.id === entityId) as EntityRef<unknown> | undefined
+			return fieldAccessor.items.find((item: { id: string }) => item.id === entityId) as EntityRef<unknown> | undefined
 		},
-		[field.items],
+		[fieldAccessor.items],
 	)
 
 	// Create entity for file and track mapping

package/src/extractors/getAudioFileDataExtractor.ts

@@ -33,7 +33,7 @@ export const getAudioFileDataExtractor = <TEntity extends Record<string, unknown
 		})
 
 		return ({ entity }) => {
-			const fields = (entity as { $fields: Record<string, FieldRef<unknown>> }).$fields
+			const fields = ((entity as unknown) as { $fields: Record<string, FieldRef<unknown>> }).$fields
 
 			if (durationField) {
 				// Round duration for integer fields

package/src/extractors/getFileUrlDataExtractor.ts

@@ -13,7 +13,7 @@ export const getFileUrlDataExtractor = <TEntity extends Record<string, unknown>>
 }: FileUrlDataExtractorProps<TEntity>): FileDataExtractor<TEntity> => ({
 	getFieldNames: () => [urlField],
 	populateFields: ({ entity, result }) => {
-		const fields = (entity as { $fields: Record<string, FieldRef<unknown>> }).$fields
+		const fields = ((entity as unknown) as { $fields: Record<string, FieldRef<unknown>> }).$fields
 		const field = fields[urlField]
 		if (field) {
 			field.setValue(result.publicUrl ?? null)

package/src/extractors/getGenericFileMetadataExtractor.ts

@@ -20,7 +20,7 @@ export const getGenericFileMetadataExtractor = <TEntity extends Record<string, u
 	getFieldNames: () => [fileNameField, fileSizeField, fileTypeField, lastModifiedField].filter((f): f is FieldName<TEntity> => !!f),
 	extractFileData: ({ file }) => {
 		return ({ entity }) => {
-			const fields = (entity as { $fields: Record<string, FieldRef<unknown>> }).$fields
+			const fields = ((entity as unknown) as { $fields: Record<string, FieldRef<unknown>> }).$fields
 
 			if (fileNameField) {
 				fields[fileNameField]?.setValue(file.name)

package/src/extractors/getImageFileDataExtractor.ts

@@ -37,7 +37,7 @@ export const getImageFileDataExtractor = <TEntity extends Record<string, unknown
 		})
 
 		return ({ entity }) => {
-			const fields = (entity as { $fields: Record<string, FieldRef<unknown>> }).$fields
+			const fields = ((entity as unknown) as { $fields: Record<string, FieldRef<unknown>> }).$fields
 
 			if (widthField) {
 				fields[widthField]?.setValue(result.width ?? null)

package/src/extractors/getVideoFileDataExtractor.ts

@@ -43,7 +43,7 @@ export const getVideoFileDataExtractor = <TEntity extends Record<string, unknown
 		})
 
 		return ({ entity }) => {
-			const fields = (entity as { $fields: Record<string, FieldRef<unknown>> }).$fields
+			const fields = ((entity as unknown) as { $fields: Record<string, FieldRef<unknown>> }).$fields
 
 			if (widthField) {
 				fields[widthField]?.setValue(result.width ?? null)

package/src/internal/hooks/useFillEntity.ts

@@ -1,5 +1,5 @@
 import { useCallback } from 'react'
-import type { EntityRef, HasOneRef } from '@contember/bindx'
+import type { EntityRef, HasOneAccessor } from '@contember/bindx'
 import type { FileType, StartUploadEvent, UploaderEvents } from '../../types.js'
 import { resolveAcceptingSingleType } from '../utils/resolveAccept.js'
 import { executeExtractors } from '../utils/executeExtractors.js'
@@ -8,25 +8,25 @@ export interface UseFillEntityArgs<TEntity = Record<string, unknown>> extends Up
 	/**
 	 * The entity to fill. Can be:
 	 * - EntityRef: fill the entity directly
-	 * - HasOneRef: fill the related entity (disconnect first on upload start)
+	 * - HasOneAccessor: fill the related entity (disconnect first on upload start)
 	 */
-	entity: EntityRef<TEntity> | HasOneRef<TEntity>
+	entity: EntityRef<TEntity> | HasOneAccessor<TEntity>
 	fileType: FileType<TEntity>
 }
 
 /**
  * Checks if the entity is a HasOneRef (has $disconnect method)
  */
-const isHasOneRef = <TEntity>(entity: EntityRef<TEntity> | HasOneRef<TEntity>): entity is HasOneRef<TEntity> => {
+const isHasOneAccessor = <TEntity>(entity: EntityRef<TEntity> | HasOneAccessor<TEntity>): entity is HasOneAccessor<TEntity> => {
 	return '$disconnect' in entity && typeof entity.$disconnect === 'function'
 }
 
 /**
  * Gets the target entity for filling.
- * For HasOneRef, returns the related entity. For EntityRef, returns the entity itself.
+ * For HasOneAccessor, returns the related entity. For EntityRef, returns the entity itself.
  */
-const getTargetEntity = <TEntity>(entity: EntityRef<TEntity> | HasOneRef<TEntity>): EntityRef<TEntity> => {
-	if (isHasOneRef(entity)) {
+const getTargetEntity = <TEntity>(entity: EntityRef<TEntity> | HasOneAccessor<TEntity>): EntityRef<TEntity> => {
+	if (isHasOneAccessor(entity)) {
 		return entity.$entity
 	}
 	return entity
@@ -54,7 +54,7 @@ export const useFillEntity = <TEntity extends Record<string, unknown>>({
 	const handleStartUpload = useCallback(
 		(event: StartUploadEvent) => {
 			// Disconnect existing relation before upload
-			if (isHasOneRef(entity)) {
+			if (isHasOneAccessor(entity)) {
 				entity.$disconnect()
 			}
 			events.onStartUpload?.(event)