@firecms/core 3.1.0-canary.9e89e98 → 3.1.0-canary.adb5759

package/src/util/entities.ts

@@ -33,7 +33,7 @@ export function isHidden(property: Property | ResolvedProperty): boolean {
     return typeof property.disabled === "object" && Boolean(property.disabled.hidden);
 }
 
-export function isPropertyBuilder<T extends CMSType, M extends Record<string, any>>(propertyOrBuilder?: PropertyOrBuilder<T, M> | Property<T> | ResolvedProperty<T>): propertyOrBuilder is PropertyBuilder<T, M> {
+export function isPropertyBuilder<T extends CMSType = CMSType, M extends Record<string, any> = any>(propertyOrBuilder?: PropertyOrBuilder<T, M> | Property | ResolvedProperty): propertyOrBuilder is PropertyBuilder<T, M> {
     return typeof propertyOrBuilder === "function";
 }
 

package/src/util/join_collections.ts

@@ -11,8 +11,8 @@ import { sortProperties } from "./collections";
 import { isPropertyBuilder } from "./entities";
 
 function applyModifyFunction(modifyCollection: ((props: ModifyCollectionProps) => (EntityCollection | void)) | undefined,
-                             collection: EntityCollection,
-                             parentPaths: string[]) {
+    collection: EntityCollection,
+    parentPaths: string[]) {
     if (modifyCollection) {
         const modified = modifyCollection({
             collection,
@@ -34,9 +34,9 @@ function applyModifyFunction(modifyCollection: ((props: ModifyCollectionProps) =
  *
  */
 export function joinCollectionLists(targetCollections: EntityCollection[],
-                                    sourceCollections: EntityCollection[] | undefined,
-                                    parentPaths: string[] = [],
-                                    modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void): EntityCollection[] {
+    sourceCollections: EntityCollection[] | undefined,
+    parentPaths: string[] = [],
+    modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void): EntityCollection[] {
 
     // merge collections that are in both lists
     const updatedCollections = (sourceCollections ?? [])
@@ -73,9 +73,9 @@ export function joinCollectionLists(targetCollections: EntityCollection[],
  *
  */
 export function mergeCollection(target: EntityCollection,
-                                source: EntityCollection,
-                                parentPaths: string[] = [],
-                                modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void
+    source: EntityCollection,
+    parentPaths: string[] = [],
+    modifyCollection?: (props: ModifyCollectionProps) => EntityCollection | void
 ): EntityCollection {
 
     const subcollectionsMerged = joinCollectionLists(
@@ -125,6 +125,8 @@ export function mergeCollection(target: EntityCollection,
 }
 
 function mergePropertyOrBuilder(target: PropertyOrBuilder, source: PropertyOrBuilder): PropertyOrBuilder {
+    if (!source) return target;
+    if (!target) return source;
     if (isPropertyBuilder(source)) {
         return source;
     } else if (isPropertyBuilder(target)) {

package/src/util/previews.ts

@@ -1,4 +1,4 @@
-import { AuthController, EntityCollection, PropertyConfig, ResolvedEntityCollection } from "../types";
+import { AuthController, EntityCollection, Property, PropertyConfig, ResolvedEntityCollection } from "../types";
 import { isReferenceProperty } from "./property_utils";
 import { isPropertyBuilder } from "./entities";
 import { getFieldConfig } from "../core";
@@ -33,7 +33,7 @@ export function getEntityTitlePropertyKey<M extends Record<string, any>>(collect
     for (const key in collection.properties) {
         const property = collection.properties[key];
         if (!isPropertyBuilder(property)) {
-            const field = getFieldConfig(property, propertyConfigs);
+            const field = getFieldConfig(property as Property, propertyConfigs);
             if (field?.key === "text_field") {
                 return key;
             }

package/src/util/property_utils.tsx

@@ -18,7 +18,7 @@ export function isReferenceProperty(
     authController: AuthController,
     propertyOrBuilder: PropertyOrBuilder,
     fields: Record<string, PropertyConfig>) {
-    const resolvedProperty = resolveProperty({
+    const resolvedProperty: ResolvedProperty<any> | null = resolveProperty({
         propertyKey: "ignore", // TODO
         propertyOrBuilder,
         propertyConfigs: fields,

package/src/util/resolutions.ts

@@ -13,6 +13,7 @@ import {
     Properties,
     PropertiesOrBuilders,
     Property,
+    PropertyBuilder,
     PropertyConfig,
     PropertyOrBuilder,
     ResolvedArrayProperty,
@@ -62,6 +63,7 @@ export const resolveCollection = <M extends Record<string, any>,>
     const usedPreviousValues = previousValues ?? values ?? defaultValues;
 
     const resolvedProperties = Object.entries(collection.properties)
+        .filter(([, propertyOrBuilder]) => propertyOrBuilder != null)
         .map(([key, propertyOrBuilder]) => {
             const childResolvedProperty = resolveProperty({
                 propertyKey: key,
@@ -108,7 +110,7 @@ export function resolveProperty<T extends CMSType = CMSType, M extends Record<st
     ...props
 }: {
     propertyKey?: string,
-    propertyOrBuilder: PropertyOrBuilder<T, M> | ResolvedProperty<T>,
+    propertyOrBuilder: PropertyOrBuilder<T, M> | ResolvedProperty<T> | PropertyOrBuilder | Property | ResolvedProperty | undefined,
     values?: Partial<M>,
     previousValues?: Partial<M>,
     path?: string,
@@ -120,7 +122,7 @@ export function resolveProperty<T extends CMSType = CMSType, M extends Record<st
     authController: AuthController;
 }): ResolvedProperty<T> | null {
 
-    if (typeof propertyOrBuilder === "object" && "resolved" in propertyOrBuilder) {
+    if (propertyOrBuilder !== null && typeof propertyOrBuilder === "object" && "resolved" in propertyOrBuilder) {
         return propertyOrBuilder as ResolvedProperty<T>;
     }
 
@@ -134,7 +136,7 @@ export function resolveProperty<T extends CMSType = CMSType, M extends Record<st
             throw Error("Trying to resolve a property builder without specifying the entity path");
 
         const usedPropertyValue = props.propertyKey ? getIn(props.values, props.propertyKey) : undefined;
-        const result: Property<T> | null = propertyOrBuilder({
+        const result: Property<T> | null = (propertyOrBuilder as PropertyBuilder<T, M>)({
             ...props,
             path,
             propertyValue: usedPropertyValue,

package/src/util/useStorageUploadController.tsx

@@ -207,43 +207,37 @@ export function useStorageUploadController<M extends object>({
                 console.error("Error processing file with custom code. Attempting to continue uploading.", e);
             }
         }
+        let newInternalValue: StorageFieldItem[] = [...internalValue];
 
-        let newInternalValue: StorageFieldItem[];
-
-        if (multipleFilesSupported) {
-            newInternalValue = [...internalValue,
-                ...(await Promise.all(acceptedFiles.map(async file => {
-                    if ((imageResize || legacyCompression) && isImageFile(file)) {
-                        file = await resizeImage(file, imageResize, legacyCompression);
-                    }
-
-                    return {
-                        id: getRandomId(),
-                        file,
-                        fileName: await fileNameBuilder(file),
-                        metadata,
-                        size
-                    } as StorageFieldItem;
-                })))];
-        } else {
-            let file = acceptedFiles[0];
+        for (let file of acceptedFiles) {
             if ((imageResize || legacyCompression) && isImageFile(file)) {
                 file = await resizeImage(file, imageResize, legacyCompression);
             }
 
-            newInternalValue = [{
-                id: getRandomId(),
-                file,
-                fileName: await fileNameBuilder(file),
-                metadata,
-                size
-            }];
+            if (multipleFilesSupported) {
+                newInternalValue.push({
+                    id: getRandomId(),
+                    file,
+                    fileName: await fileNameBuilder(file),
+                    metadata,
+                    size
+                } as StorageFieldItem);
+            } else {
+                newInternalValue = [{
+                    id: getRandomId(),
+                    file,
+                    fileName: await fileNameBuilder(file),
+                    metadata,
+                    size
+                }];
+                break; // Only keep the first file
+            }
         }
 
         // Remove either storage path or file duplicates
         newInternalValue = removeDuplicates(newInternalValue);
         setInternalValue(newInternalValue);
-    }, [disabled, fileNameBuilder, internalValue, metadata, multipleFilesSupported, size, imageResize, legacyCompression]);
+    }, [disabled, fileNameBuilder, internalValue, metadata, multipleFilesSupported, size, imageResize, legacyCompression, processFile]);
 
     return {
         internalValue,
@@ -300,7 +294,7 @@ function getRandomId() {
 /**
  * Check if a file is an image type supported for resizing
  */
-function isImageFile(file: File): boolean {
+export function isImageFile(file: File): boolean {
     return file.type === "image/jpeg" ||
         file.type === "image/png" ||
         file.type === "image/webp";
@@ -310,7 +304,7 @@ function isImageFile(file: File): boolean {
  * Resize and compress an image using compressorjs.
  * Supports both the new imageResize API and legacy imageCompression for backward compatibility.
  */
-async function resizeImage(
+export async function resizeImage(
     file: File,
     imageResize?: StorageConfig["imageResize"],
     legacyCompression?: ImageResize