@rebasepro/common 0.28.2 → 0.29.0-canary.g0e3a0e7

package/dist/util/resolutions.es.js

@@ -9,13 +9,15 @@ import { getIn, isDefaultFieldConfigId, mergeDeep } from "@rebasepro/utils";
 function resolveProperty(props) {
 	const { property, ignoreMissingFields = false, ...rest } = props;
 	let resultProperty;
+	const { entityId, ...builderProps } = rest;
 	if (isPropertyBuilder(property)) {
 		const path = rest.path;
 		if (!path) resultProperty = property;
 		else {
 			const usedPropertyValue = rest.propertyKey ? getIn(rest.values, rest.propertyKey) : void 0;
 			const dynamicProps = property.dynamicProps?.({
-				...rest,
+				...builderProps,
+				id: entityId,
 				path,
 				propertyValue: usedPropertyValue,
 				values: rest.values ?? {},
@@ -28,7 +30,8 @@ function resolveProperty(props) {
 		const path = rest.path;
 		const usedPropertyValue = rest.propertyKey ? getIn(rest.values, rest.propertyKey) : void 0;
 		const dynamicPropsResult = resultProperty.dynamicProps({
-			...rest,
+			...builderProps,
+			id: entityId,
 			path,
 			propertyValue: usedPropertyValue,
 			values: rest.values ?? {},

package/dist/util/resolutions.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolutions.es.js","names":[],"sources":["../../src/util/resolutions.ts"],"sourcesContent":["import {\n    ArrayProperty,\n    AuthState,\n    CollectionConfig,\n    EnumValueConfig,\n    EnumValues,\n    NumberProperty,\n    Properties,\n    Property,\n    RelationProperty,\n    ResolvedRelation,\n    StringProperty,\n    getDataSourceCapabilities,\n    getDeclaredSubcollections,\n    type EntityChildView\n} from \"@rebasepro/types\";\n\ntype PropertyConfig = { property: unknown; [key: string]: unknown };\nimport { isPropertyBuilder } from \"./entities\";\nimport { enumToObjectEntries } from \"./enums\";\nimport { DEFAULT_ONE_OF_TYPE } from \"./common\";\nimport { isDefaultFieldConfigId } from \"@rebasepro/utils\";\nimport { getIn, mergeDeep } from \"@rebasepro/utils\";\nimport { isJunctionBackedRelation, resolveCollectionRelations } from \"./relations\";\nimport { resolveRelation } from \"./resolve-relation\";\n\n/**\n * Resolve property builders, enums and arrays.\n */\n\nexport type ResolvePropertyProps<M extends Record<string, unknown> = Record<string, unknown>> = {\n    property: Property\n    propertyKey?: string,\n    values?: Partial<M>,\n    previousValues?: Partial<M>,\n    path?: string,\n    entityId?: string | number,\n    index?: number,\n    propertyConfigs?: Record<string, PropertyConfig>;\n    ignoreMissingFields?: boolean;\n    authController: AuthState;\n}\n\nexport function resolveProperty<M extends Record<string, unknown> = Record<string, unknown>>(props: ResolvePropertyProps<M>): Property | null {\n\n    const {\n        property,\n        ignoreMissingFields = false,\n        ...rest\n    } = props;\n\n    let resultProperty: Property;\n\n    if (isPropertyBuilder(property)) {\n        const path = rest.path;\n        if (!path) {\n            // When path is not available (e.g. in preview contexts), skip dynamic\n            // resolution and use the property as-is without dynamic modifications.\n            resultProperty = property as Property;\n        } else {\n            const usedPropertyValue = rest.propertyKey ? getIn(rest.values, rest.propertyKey) : undefined;\n            const dynamicProps = property.dynamicProps?.({\n                ...rest,\n                path,\n                propertyValue: usedPropertyValue,\n                values: rest.values ?? {},\n                previousValues: rest.previousValues ?? rest.values ?? {}\n            });\n            resultProperty = mergeDeep(property, dynamicProps ?? {});\n        }\n    } else {\n        resultProperty = property as Property;\n    }\n\n    // Apply dynamic properties if they exist\n    if (resultProperty?.dynamicProps && rest.path) {\n        const path = rest.path;\n        const usedPropertyValue = rest.propertyKey ? getIn(rest.values, rest.propertyKey) : undefined;\n        const dynamicPropsResult = resultProperty.dynamicProps({\n            ...rest,\n            path,\n            propertyValue: usedPropertyValue,\n            values: rest.values ?? {},\n            previousValues: rest.previousValues ?? rest.values ?? {}\n        });\n\n        if (dynamicPropsResult) {\n            resultProperty = mergeDeep(resultProperty, dynamicPropsResult);\n        }\n    }\n\n    let resolvedProperty: Property | null;\n\n    if (resultProperty?.type === \"map\" && resultProperty.properties) {\n        const properties = resolveProperties({\n            ignoreMissingFields,\n            ...rest,\n            properties: resultProperty.properties\n        });\n        resolvedProperty = {\n            ...resultProperty,\n            properties\n        } as Property;\n    } else if (resultProperty?.type === \"array\") {\n        resolvedProperty = resultProperty;\n    } else if ((resultProperty?.type === \"string\" || resultProperty?.type === \"number\") && resultProperty.enum) {\n        resolvedProperty = resolvePropertyEnum(resultProperty);\n    } else {\n        resolvedProperty = resultProperty;\n    }\n\n    if (resolvedProperty?.propertyConfig && !isDefaultFieldConfigId(resolvedProperty.propertyConfig)) {\n        const cmsFields = rest.propertyConfigs;\n        if (!cmsFields && !ignoreMissingFields) {\n            throw Error(`Trying to resolve a property with key '${resolvedProperty.propertyConfig}' that inherits from a custom property config but no custom property configs were provided. Use the property 'propertyConfigs' in your app config to provide them`);\n        }\n        const customField: PropertyConfig | undefined = cmsFields?.[resolvedProperty.propertyConfig];\n        if (!customField) {\n            console.warn(`Trying to resolve a property with key '${resolvedProperty.propertyConfig}' that inherits from a custom property config but no custom property config with that key was found. Check the 'propertyConfigs' in your app config`)\n            return resolvedProperty;\n        }\n        if (customField.property) {\n            const restConfigProperty = { ...customField.property } as Record<string, unknown>;\n            delete restConfigProperty.propertyConfig;\n            const customFieldProperty = resolveProperty({\n                property: { name: \"\",\n...restConfigProperty } as Property,\n                ignoreMissingFields,\n                ...rest\n            });\n            if (customFieldProperty) {\n                resolvedProperty = mergeDeep(customFieldProperty, resolvedProperty);\n            }\n        }\n\n    }\n\n    return resolvedProperty;\n}\n\n/**\n * The resolved relation a relation property refers to.\n *\n * Normalization stamps `resolvedRelation` onto the property, so this is usually\n * a field read. It falls back to resolving from the collection for properties\n * that never went through the registry — a preview, or a form rendered straight\n * from an authored config.\n */\nexport function resolveRelationProperty(\n    property: RelationProperty,\n    collection: CollectionConfig,\n    propertyKey?: string\n): ResolvedRelation {\n    if (property.resolvedRelation) return property.resolvedRelation;\n\n    if (property.relation) {\n        return resolveRelation(property.relation, collection, propertyKey);\n    }\n\n    const name = propertyKey ?? \"\";\n    const declared = resolveCollectionRelations(collection)[name];\n    if (!declared) {\n        throw Error(\n            `Relation property '${name || \"(unnamed)\"}' on '${collection.slug}' declares no \\`relation\\`, ` +\n            \"and the collection has no relation of that name.\"\n        );\n    }\n    return declared;\n}\n\n/**\n * Resolve enum aliases for a string or number property\n * @param property\n */\nexport function resolvePropertyEnum(property: StringProperty | NumberProperty): StringProperty | NumberProperty {\n    if (typeof property.enum === \"object\") {\n        return {\n            ...property,\n            enum: enumToObjectEntries(property.enum)?.filter((value) => value && (value.id || value.id === 0) && value.label) ?? []\n        };\n    }\n    return property as StringProperty | NumberProperty;\n}\n\n/**\n * Resolve enums and arrays for properties\n * @param properties\n * @param value\n */\nexport function resolveProperties<M extends Record<string, unknown>>({\n    propertyKey,\n    properties,\n    ignoreMissingFields,\n    ...props\n}: {\n    propertyKey?: string,\n    properties: Properties,\n    values?: Partial<M>,\n    previousValues?: Partial<M>,\n    path?: string,\n    entityId?: string | number,\n    index?: number,\n    propertyConfigs?: Record<string, PropertyConfig>;\n    ignoreMissingFields?: boolean;\n    authController: AuthState;\n}): Properties {\n    return Object.entries<Property>(properties as Record<string, Property>)\n        .map(([key, property]) => {\n            const childResolvedProperty = resolveProperty({\n                propertyKey: propertyKey ? `${propertyKey}.${key}` : undefined,\n                property: property,\n                ignoreMissingFields,\n                ...props\n            });\n            if (!childResolvedProperty) return {};\n            return {\n                [key]: childResolvedProperty\n            };\n        })\n        .filter((a) => a !== null)\n        .reduce((a, b) => ({ ...a,\n...b }), {}) as Properties;\n}\n\nexport function resolveArrayProperties<M>({\n    propertyKey,\n    property,\n    ignoreMissingFields = false,\n    ...props\n}: {\n    propertyKey?: string,\n    property: ArrayProperty,\n    values?: Partial<M>,\n    previousValues?: Partial<M>,\n    path?: string,\n    entityId?: string | number,\n    index?: number,\n    propertyConfigs?: Record<string, PropertyConfig>;\n    ignoreMissingFields?: boolean;\n    authController: AuthState;\n}): Property[] {\n    const propertyValue = propertyKey ? getIn(props.values, propertyKey) : undefined;\n\n    if (property.of) {\n        if (Array.isArray(property.of)) {\n            return property.of.map((p, index) => {\n                return resolveProperty({\n                    propertyKey: `${propertyKey}.${index}`,\n                    property: p as Property,\n                    ignoreMissingFields,\n                    ...props,\n                    index\n                });\n            }) as Property[];\n        } else {\n            const of = property.of;\n            const resolvedProperties = getArrayResolvedProperties({\n                propertyValue,\n                propertyKey,\n                property,\n                ignoreMissingFields,\n                ...props\n            });\n            // Destructured to be *excluded* from `...rest`, not to be used —\n            // see the comment below. Said explicitly so the discarded-value\n            // ratchet does not carry a finding that is working as intended.\n            // eslint-disable-next-line @typescript-eslint/no-unused-vars\n            const { values, previousValues, ...rest } = props;\n            const ofProperty = resolveProperty({ // we don't want to pass the values of the parent entity\n                property: of,\n                ignoreMissingFields,\n                ...rest\n            });\n            if (!ofProperty && !ignoreMissingFields)\n                throw Error(\"When using a property builder as the 'of' prop of an ArrayProperty, you must return a valid child property\")\n            return resolvedProperties;\n        }\n    } else if (property.oneOf) {\n        const typeField = property.oneOf?.typeField ?? DEFAULT_ONE_OF_TYPE;\n        const resolvedProperties: Property[] = Array.isArray(propertyValue)\n            ? propertyValue.map((v, index) => {\n                const type = v && v[typeField];\n                const childProperty = property.oneOf?.properties[type];\n                if (!type || !childProperty) return null;\n                return resolveProperty({\n                    propertyKey: `${propertyKey}.${index}`,\n                    property: childProperty,\n                    ignoreMissingFields,\n                    ...props\n                });\n            }).filter(e => Boolean(e)) as Property[]\n            : [];\n        return resolvedProperties;\n    } else if (!property.columnType) {\n        // An array with neither `of`/`oneOf` nor a `columnType` describes no element\n        // type, so nothing can be generated or rendered from it.\n        //\n        // The escape hatch used to be `ui.Field` — \"a custom component can render\n        // anything\" — which made a *presentation* field decide whether a schema was\n        // valid, in code the Postgres generator runs. `columnType` is the same escape\n        // hatch stated as data: `columnType: \"text[]\"` says what the column holds,\n        // which is what both the generator and the form actually need.\n        throw Error(`The array property (${propertyKey}) needs to declare an 'of' or a 'oneOf' property, or a \\`columnType\\` such as \"text[]\"`);\n    } else {\n        return [];\n    }\n\n}\n\nexport function getArrayResolvedProperties({\n    propertyKey,\n    propertyValue,\n    property,\n    ...props\n}: {\n    propertyValue: unknown,\n    propertyKey?: string,\n    property: ArrayProperty,\n    ignoreMissingFields: boolean,\n    values?: object;\n    previousValues?: object;\n    path?: string;\n    entityId?: string | number;\n    index?: number;\n    propertyConfigs?: Record<string, PropertyConfig>;\n    authController: AuthState;\n}) {\n\n    const of = property.of;\n    if (!of)\n        throw Error(\n            `Trying to resolve an array property (${propertyKey}) without providing an 'of' property`\n        )\n    return Array.isArray(propertyValue)\n        ? propertyValue.map((v: unknown, index: number) => {\n            return resolveProperty({\n                propertyKey: `${propertyKey}.${index}`,\n                property: Array.isArray(of) ? of[index] : of,\n                ...props,\n                index\n            });\n        }).filter(e => Boolean(e)) as Property[]\n        : [];\n}\n\n/**\n * An enum as `{ id, label }` entries, or `undefined` when it is not one.\n *\n * {@link enumToObjectEntries} is the reading: an array is a list of entries or\n * of plain values (`[\"draft\", \"published\"]`, whose ids are the values, not\n * their positions), and a map entry's id is its key even when its value is a\n * config that does not repeat it.\n */\nexport function resolveEnumValues(input: EnumValues | Array<string | number>): EnumValueConfig[] | undefined {\n    if (typeof input !== \"object\" || input === null) return undefined;\n    return enumToObjectEntries(input);\n}\n\n\n/**\n * The lists rendered inside an entity view of `collection` — its tabs.\n *\n * The single derivation. There used to be two that disagreed: this one, and a\n * copy in `CollectionRegistry.normalizeCollection` that stamped each child with\n * the *target collection's* slug instead of the relation key. Since the\n * registry ran first and cached its answer onto `childCollections`, its version\n * was the one that won, and the frontend addressed child listings by a segment\n * the backend could not resolve.\n *\n * Order of precedence:\n *   1. `childCollections` — the explicit escape hatch for custom drivers.\n *   2. `subcollections` on an engine that has real containment (Firestore).\n *   3. many-relations on an engine that has relations (SQL).\n */\nexport function getEntityChildViews<M extends Record<string, unknown> = Record<string, unknown>>(\n    collection: CollectionConfig<M>\n): EntityChildView[] {\n    const asSubcollections = (collections: CollectionConfig<Record<string, unknown>>[]): EntityChildView[] =>\n        collections.filter(Boolean).map(child => ({\n            key: child.slug,\n            collection: child,\n            source: { kind: \"subcollection\" as const }\n        }));\n\n    if (collection.childCollections) {\n        return asSubcollections(collection.childCollections() ?? []);\n    }\n\n    const capabilities = getDataSourceCapabilities(collection.engine);\n\n    const declaredSubcollections = getDeclaredSubcollections(collection);\n    if (capabilities.supportsSubcollections && declaredSubcollections) {\n        return asSubcollections(declaredSubcollections() ?? []);\n    }\n\n    if (!capabilities.supportsRelations) return [];\n\n    const resolvedRelations = resolveCollectionRelations(collection);\n    const views: EntityChildView[] = [];\n    const seen = new Set<string>();\n\n    // Keyed by the map key, not by `relationName`: the map key is what\n    // `findRelation` matches a path segment against, so it is the only one that\n    // addresses the same relation on both sides of the wire. The map registers\n    // some relations twice — once canonically, once under the declaring\n    // property key — so dedupe on the underlying relation.\n    for (const [relationKey, relation] of Object.entries(resolvedRelations)) {\n        if (relation.cardinality !== \"many\") continue;\n\n        const identity = relation.relationName ?? relationKey;\n        if (seen.has(identity)) continue;\n\n        let target: CollectionConfig | undefined;\n        try {\n            target = relation.target();\n        } catch {\n            continue;\n        }\n        if (!target) continue;\n        seen.add(identity);\n\n        // A name given to the declaring property is the author naming the tab.\n        // Only the tab: it is a plural (\"Tags\"), and one row of it is still\n        // what the target calls one (\"Tag\").\n        const declaringProperty = Object.entries((collection.properties ?? {}) as Record<string, Property>)\n            .find(([propKey, p]) => p.type === \"relation\" && ((p as RelationProperty).relation?.relationName ?? propKey) === identity);\n        const customName = declaringProperty?.[1]?.name;\n\n        const base: CollectionConfig<Record<string, unknown>> = {\n            ...target,\n            slug: relationKey,\n            ...(customName ? { name: customName } : {})\n        } as CollectionConfig<Record<string, unknown>>;\n\n        views.push({\n            key: relationKey,\n            collection: (relation.overrides ? mergeDeep(base, relation.overrides) : base) as CollectionConfig<Record<string, unknown>>,\n            source: {\n                kind: \"relation\",\n                relationKey,\n                mode: isJunctionBackedRelation(relation) ? \"linked\" : \"owned\",\n                targetSlug: target.slug\n            }\n        });\n    }\n\n    return views;\n}\n\n/**\n * Each of `collection`'s tabs paired with the property that declared it, when a\n * property declared it: child view key → property key.\n *\n * A many-relation can only be declared as a property — that is the documented\n * and only mechanism — and {@link getEntityChildViews} promotes it to a tab. So\n * one declaration reaches the panel twice, and neither surface knew about the\n * other. The form rendered a relation picker beside the tab, and the collection\n * table rendered *two* columns under one heading: the relation's own column,\n * showing the child rows, and a jump-to-tab button carrying the same name.\n *\n * The pairing is what lets each surface decide which half is redundant, and it\n * has to be a pairing rather than two sets because the two keys differ whenever\n * a relation is named. The match is on the resolved `relationName` — the\n * identity `getEntityChildViews` itself dedupes on — so a relation declared in\n * `relations` and pointed at by a differently-named property is recognised too.\n *\n * A relation with no property of its own is absent here, which is the point: it\n * has exactly one surface already, and nothing to weigh it against.\n *\n * Only top-level properties: a relation nested inside a `map` gets no tab.\n */\nexport function getChildViewDeclaringProperties<M extends Record<string, unknown> = Record<string, unknown>>(\n    collection: CollectionConfig<M>\n): Map<string, string> {\n    const pairs = new Map<string, string>();\n\n    const relationProperties = Object.entries((collection.properties ?? {}) as Record<string, Property>)\n        .filter(([, property]) => property?.type === \"relation\");\n    if (relationProperties.length === 0) return pairs;\n\n    const relationViews = getEntityChildViews(collection)\n        .filter(view => view.source.kind === \"relation\");\n    if (relationViews.length === 0) return pairs;\n\n    const resolvedRelations = resolveCollectionRelations(collection);\n    const identityOf = (relationKey: string): string =>\n        resolvedRelations[relationKey]?.relationName ?? relationKey;\n\n    const declaringPropertyByIdentity = new Map<string, string>();\n    for (const [propertyKey, property] of relationProperties) {\n        const relation = (property as RelationProperty).resolvedRelation ?? resolvedRelations[propertyKey];\n        // A to-one relation is a foreign key the author edits, never a tab. No\n        // view will match it — the views here are many-relations only — but\n        // reading the cardinality says so where someone is looking.\n        if (relation?.cardinality !== \"many\") continue;\n        const identity = relation.relationName ?? propertyKey;\n        if (!declaringPropertyByIdentity.has(identity)) declaringPropertyByIdentity.set(identity, propertyKey);\n    }\n\n    for (const view of relationViews) {\n        const propertyKey = declaringPropertyByIdentity.get(\n            identityOf((view.source as { relationKey: string }).relationKey));\n        if (propertyKey) pairs.set(view.key, propertyKey);\n    }\n\n    return pairs;\n}\n\n/**\n * The property keys of `collection` whose relation is already one of its tabs.\n *\n * What a form asks: the tab is the treatment for a list of child rows, so the\n * picker beside it is the redundant half. See\n * {@link getChildViewDeclaringProperties}.\n */\nexport function getChildViewRelationPropertyKeys<M extends Record<string, unknown> = Record<string, unknown>>(\n    collection: CollectionConfig<M>\n): Set<string> {\n    return new Set(getChildViewDeclaringProperties(collection).values());\n}\n\n/**\n * The child views of `collection` as bare collections.\n *\n * The flattened view of {@link getEntityChildViews}, for navigation code that\n * only needs to match a path segment against a slug. Anything that cares *what\n * kind* of list it is showing — chiefly the admin, which must not offer a\n * global delete on a shared row — should read the views instead.\n */\nexport function getSubcollections<M extends Record<string, unknown> = Record<string, unknown>>(collection: CollectionConfig<M>): CollectionConfig<Record<string, unknown>>[] {\n    return getEntityChildViews(collection).map(view => view.collection);\n}\n"],"mappings":"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"}
+{"version":3,"file":"resolutions.es.js","names":[],"sources":["../../src/util/resolutions.ts"],"sourcesContent":["import {\n    ArrayProperty,\n    AuthState,\n    CollectionConfig,\n    EnumValueConfig,\n    EnumValues,\n    NumberProperty,\n    Properties,\n    Property,\n    RelationProperty,\n    ResolvedRelation,\n    StringProperty,\n    getDataSourceCapabilities,\n    getDeclaredSubcollections,\n    type EntityChildView\n} from \"@rebasepro/types\";\n\ntype PropertyConfig = { property: unknown; [key: string]: unknown };\nimport { isPropertyBuilder } from \"./entities\";\nimport { enumToObjectEntries } from \"./enums\";\nimport { DEFAULT_ONE_OF_TYPE } from \"./common\";\nimport { isDefaultFieldConfigId } from \"@rebasepro/utils\";\nimport { getIn, mergeDeep } from \"@rebasepro/utils\";\nimport { isJunctionBackedRelation, resolveCollectionRelations } from \"./relations\";\nimport { resolveRelation } from \"./resolve-relation\";\n\n/**\n * Resolve property builders, enums and arrays.\n */\n\nexport type ResolvePropertyProps<M extends Record<string, unknown> = Record<string, unknown>> = {\n    property: Property\n    propertyKey?: string,\n    values?: Partial<M>,\n    previousValues?: Partial<M>,\n    path?: string,\n    entityId?: string | number,\n    index?: number,\n    propertyConfigs?: Record<string, PropertyConfig>;\n    ignoreMissingFields?: boolean;\n    authController: AuthState;\n}\n\nexport function resolveProperty<M extends Record<string, unknown> = Record<string, unknown>>(props: ResolvePropertyProps<M>): Property | null {\n\n    const {\n        property,\n        ignoreMissingFields = false,\n        ...rest\n    } = props;\n\n    let resultProperty: Property;\n    // What a `dynamicProps` builder is handed: the record's id as `id`.\n    const { entityId, ...builderProps } = rest;\n\n    if (isPropertyBuilder(property)) {\n        const path = rest.path;\n        if (!path) {\n            // When path is not available (e.g. in preview contexts), skip dynamic\n            // resolution and use the property as-is without dynamic modifications.\n            resultProperty = property as Property;\n        } else {\n            const usedPropertyValue = rest.propertyKey ? getIn(rest.values, rest.propertyKey) : undefined;\n            const dynamicProps = property.dynamicProps?.({\n                ...builderProps,\n                id: entityId,\n                path,\n                propertyValue: usedPropertyValue,\n                values: rest.values ?? {},\n                previousValues: rest.previousValues ?? rest.values ?? {}\n            });\n            resultProperty = mergeDeep(property, dynamicProps ?? {});\n        }\n    } else {\n        resultProperty = property as Property;\n    }\n\n    // Apply dynamic properties if they exist\n    if (resultProperty?.dynamicProps && rest.path) {\n        const path = rest.path;\n        const usedPropertyValue = rest.propertyKey ? getIn(rest.values, rest.propertyKey) : undefined;\n        const dynamicPropsResult = resultProperty.dynamicProps({\n            ...builderProps,\n            id: entityId,\n            path,\n            propertyValue: usedPropertyValue,\n            values: rest.values ?? {},\n            previousValues: rest.previousValues ?? rest.values ?? {}\n        });\n\n        if (dynamicPropsResult) {\n            resultProperty = mergeDeep(resultProperty, dynamicPropsResult);\n        }\n    }\n\n    let resolvedProperty: Property | null;\n\n    if (resultProperty?.type === \"map\" && resultProperty.properties) {\n        const properties = resolveProperties({\n            ignoreMissingFields,\n            ...rest,\n            properties: resultProperty.properties\n        });\n        resolvedProperty = {\n            ...resultProperty,\n            properties\n        } as Property;\n    } else if (resultProperty?.type === \"array\") {\n        resolvedProperty = resultProperty;\n    } else if ((resultProperty?.type === \"string\" || resultProperty?.type === \"number\") && resultProperty.enum) {\n        resolvedProperty = resolvePropertyEnum(resultProperty);\n    } else {\n        resolvedProperty = resultProperty;\n    }\n\n    if (resolvedProperty?.propertyConfig && !isDefaultFieldConfigId(resolvedProperty.propertyConfig)) {\n        const cmsFields = rest.propertyConfigs;\n        if (!cmsFields && !ignoreMissingFields) {\n            throw Error(`Trying to resolve a property with key '${resolvedProperty.propertyConfig}' that inherits from a custom property config but no custom property configs were provided. Use the property 'propertyConfigs' in your app config to provide them`);\n        }\n        const customField: PropertyConfig | undefined = cmsFields?.[resolvedProperty.propertyConfig];\n        if (!customField) {\n            console.warn(`Trying to resolve a property with key '${resolvedProperty.propertyConfig}' that inherits from a custom property config but no custom property config with that key was found. Check the 'propertyConfigs' in your app config`)\n            return resolvedProperty;\n        }\n        if (customField.property) {\n            const restConfigProperty = { ...customField.property } as Record<string, unknown>;\n            delete restConfigProperty.propertyConfig;\n            const customFieldProperty = resolveProperty({\n                property: { name: \"\",\n...restConfigProperty } as Property,\n                ignoreMissingFields,\n                ...rest\n            });\n            if (customFieldProperty) {\n                resolvedProperty = mergeDeep(customFieldProperty, resolvedProperty);\n            }\n        }\n\n    }\n\n    return resolvedProperty;\n}\n\n/**\n * The resolved relation a relation property refers to.\n *\n * Normalization stamps `resolvedRelation` onto the property, so this is usually\n * a field read. It falls back to resolving from the collection for properties\n * that never went through the registry — a preview, or a form rendered straight\n * from an authored config.\n */\nexport function resolveRelationProperty(\n    property: RelationProperty,\n    collection: CollectionConfig,\n    propertyKey?: string\n): ResolvedRelation {\n    if (property.resolvedRelation) return property.resolvedRelation;\n\n    if (property.relation) {\n        return resolveRelation(property.relation, collection, propertyKey);\n    }\n\n    const name = propertyKey ?? \"\";\n    const declared = resolveCollectionRelations(collection)[name];\n    if (!declared) {\n        throw Error(\n            `Relation property '${name || \"(unnamed)\"}' on '${collection.slug}' declares no \\`relation\\`, ` +\n            \"and the collection has no relation of that name.\"\n        );\n    }\n    return declared;\n}\n\n/**\n * Resolve enum aliases for a string or number property\n * @param property\n */\nexport function resolvePropertyEnum(property: StringProperty | NumberProperty): StringProperty | NumberProperty {\n    if (typeof property.enum === \"object\") {\n        return {\n            ...property,\n            enum: enumToObjectEntries(property.enum)?.filter((value) => value && (value.id || value.id === 0) && value.label) ?? []\n        };\n    }\n    return property as StringProperty | NumberProperty;\n}\n\n/**\n * Resolve enums and arrays for properties\n * @param properties\n * @param value\n */\nexport function resolveProperties<M extends Record<string, unknown>>({\n    propertyKey,\n    properties,\n    ignoreMissingFields,\n    ...props\n}: {\n    propertyKey?: string,\n    properties: Properties,\n    values?: Partial<M>,\n    previousValues?: Partial<M>,\n    path?: string,\n    entityId?: string | number,\n    index?: number,\n    propertyConfigs?: Record<string, PropertyConfig>;\n    ignoreMissingFields?: boolean;\n    authController: AuthState;\n}): Properties {\n    return Object.entries<Property>(properties as Record<string, Property>)\n        .map(([key, property]) => {\n            const childResolvedProperty = resolveProperty({\n                propertyKey: propertyKey ? `${propertyKey}.${key}` : undefined,\n                property: property,\n                ignoreMissingFields,\n                ...props\n            });\n            if (!childResolvedProperty) return {};\n            return {\n                [key]: childResolvedProperty\n            };\n        })\n        .filter((a) => a !== null)\n        .reduce((a, b) => ({ ...a,\n...b }), {}) as Properties;\n}\n\nexport function resolveArrayProperties<M>({\n    propertyKey,\n    property,\n    ignoreMissingFields = false,\n    ...props\n}: {\n    propertyKey?: string,\n    property: ArrayProperty,\n    values?: Partial<M>,\n    previousValues?: Partial<M>,\n    path?: string,\n    entityId?: string | number,\n    index?: number,\n    propertyConfigs?: Record<string, PropertyConfig>;\n    ignoreMissingFields?: boolean;\n    authController: AuthState;\n}): Property[] {\n    const propertyValue = propertyKey ? getIn(props.values, propertyKey) : undefined;\n\n    if (property.of) {\n        if (Array.isArray(property.of)) {\n            return property.of.map((p, index) => {\n                return resolveProperty({\n                    propertyKey: `${propertyKey}.${index}`,\n                    property: p as Property,\n                    ignoreMissingFields,\n                    ...props,\n                    index\n                });\n            }) as Property[];\n        } else {\n            const of = property.of;\n            const resolvedProperties = getArrayResolvedProperties({\n                propertyValue,\n                propertyKey,\n                property,\n                ignoreMissingFields,\n                ...props\n            });\n            // Destructured to be *excluded* from `...rest`, not to be used —\n            // see the comment below. Said explicitly so the discarded-value\n            // ratchet does not carry a finding that is working as intended.\n            // eslint-disable-next-line @typescript-eslint/no-unused-vars\n            const { values, previousValues, ...rest } = props;\n            const ofProperty = resolveProperty({ // we don't want to pass the values of the parent entity\n                property: of,\n                ignoreMissingFields,\n                ...rest\n            });\n            if (!ofProperty && !ignoreMissingFields)\n                throw Error(\"When using a property builder as the 'of' prop of an ArrayProperty, you must return a valid child property\")\n            return resolvedProperties;\n        }\n    } else if (property.oneOf) {\n        const typeField = property.oneOf?.typeField ?? DEFAULT_ONE_OF_TYPE;\n        const resolvedProperties: Property[] = Array.isArray(propertyValue)\n            ? propertyValue.map((v, index) => {\n                const type = v && v[typeField];\n                const childProperty = property.oneOf?.properties[type];\n                if (!type || !childProperty) return null;\n                return resolveProperty({\n                    propertyKey: `${propertyKey}.${index}`,\n                    property: childProperty,\n                    ignoreMissingFields,\n                    ...props\n                });\n            }).filter(e => Boolean(e)) as Property[]\n            : [];\n        return resolvedProperties;\n    } else if (!property.columnType) {\n        // An array with neither `of`/`oneOf` nor a `columnType` describes no element\n        // type, so nothing can be generated or rendered from it.\n        //\n        // The escape hatch used to be `ui.Field` — \"a custom component can render\n        // anything\" — which made a *presentation* field decide whether a schema was\n        // valid, in code the Postgres generator runs. `columnType` is the same escape\n        // hatch stated as data: `columnType: \"text[]\"` says what the column holds,\n        // which is what both the generator and the form actually need.\n        throw Error(`The array property (${propertyKey}) needs to declare an 'of' or a 'oneOf' property, or a \\`columnType\\` such as \"text[]\"`);\n    } else {\n        return [];\n    }\n\n}\n\nexport function getArrayResolvedProperties({\n    propertyKey,\n    propertyValue,\n    property,\n    ...props\n}: {\n    propertyValue: unknown,\n    propertyKey?: string,\n    property: ArrayProperty,\n    ignoreMissingFields: boolean,\n    values?: object;\n    previousValues?: object;\n    path?: string;\n    entityId?: string | number;\n    index?: number;\n    propertyConfigs?: Record<string, PropertyConfig>;\n    authController: AuthState;\n}) {\n\n    const of = property.of;\n    if (!of)\n        throw Error(\n            `Trying to resolve an array property (${propertyKey}) without providing an 'of' property`\n        )\n    return Array.isArray(propertyValue)\n        ? propertyValue.map((v: unknown, index: number) => {\n            return resolveProperty({\n                propertyKey: `${propertyKey}.${index}`,\n                property: Array.isArray(of) ? of[index] : of,\n                ...props,\n                index\n            });\n        }).filter(e => Boolean(e)) as Property[]\n        : [];\n}\n\n/**\n * An enum as `{ id, label }` entries, or `undefined` when it is not one.\n *\n * {@link enumToObjectEntries} is the reading: an array is a list of entries or\n * of plain values (`[\"draft\", \"published\"]`, whose ids are the values, not\n * their positions), and a map entry's id is its key even when its value is a\n * config that does not repeat it.\n */\nexport function resolveEnumValues(input: EnumValues | Array<string | number>): EnumValueConfig[] | undefined {\n    if (typeof input !== \"object\" || input === null) return undefined;\n    return enumToObjectEntries(input);\n}\n\n\n/**\n * The lists rendered inside an entity view of `collection` — its tabs.\n *\n * The single derivation. There used to be two that disagreed: this one, and a\n * copy in `CollectionRegistry.normalizeCollection` that stamped each child with\n * the *target collection's* slug instead of the relation key. Since the\n * registry ran first and cached its answer onto `childCollections`, its version\n * was the one that won, and the frontend addressed child listings by a segment\n * the backend could not resolve.\n *\n * Order of precedence:\n *   1. `childCollections` — the explicit escape hatch for custom drivers.\n *   2. `subcollections` on an engine that has real containment (Firestore).\n *   3. many-relations on an engine that has relations (SQL).\n */\nexport function getEntityChildViews<M extends Record<string, unknown> = Record<string, unknown>>(\n    collection: CollectionConfig<M>\n): EntityChildView[] {\n    const asSubcollections = (collections: CollectionConfig<Record<string, unknown>>[]): EntityChildView[] =>\n        collections.filter(Boolean).map(child => ({\n            key: child.slug,\n            collection: child,\n            source: { kind: \"subcollection\" as const }\n        }));\n\n    if (collection.childCollections) {\n        return asSubcollections(collection.childCollections() ?? []);\n    }\n\n    const capabilities = getDataSourceCapabilities(collection.engine);\n\n    const declaredSubcollections = getDeclaredSubcollections(collection);\n    if (capabilities.supportsSubcollections && declaredSubcollections) {\n        return asSubcollections(declaredSubcollections() ?? []);\n    }\n\n    if (!capabilities.supportsRelations) return [];\n\n    const resolvedRelations = resolveCollectionRelations(collection);\n    const views: EntityChildView[] = [];\n    const seen = new Set<string>();\n\n    // Keyed by the map key, not by `relationName`: the map key is what\n    // `findRelation` matches a path segment against, so it is the only one that\n    // addresses the same relation on both sides of the wire. The map registers\n    // some relations twice — once canonically, once under the declaring\n    // property key — so dedupe on the underlying relation.\n    for (const [relationKey, relation] of Object.entries(resolvedRelations)) {\n        if (relation.cardinality !== \"many\") continue;\n\n        const identity = relation.relationName ?? relationKey;\n        if (seen.has(identity)) continue;\n\n        let target: CollectionConfig | undefined;\n        try {\n            target = relation.target();\n        } catch {\n            continue;\n        }\n        if (!target) continue;\n        seen.add(identity);\n\n        // A name given to the declaring property is the author naming the tab.\n        // Only the tab: it is a plural (\"Tags\"), and one row of it is still\n        // what the target calls one (\"Tag\").\n        const declaringProperty = Object.entries((collection.properties ?? {}) as Record<string, Property>)\n            .find(([propKey, p]) => p.type === \"relation\" && ((p as RelationProperty).relation?.relationName ?? propKey) === identity);\n        const customName = declaringProperty?.[1]?.name;\n\n        const base: CollectionConfig<Record<string, unknown>> = {\n            ...target,\n            slug: relationKey,\n            ...(customName ? { name: customName } : {})\n        } as CollectionConfig<Record<string, unknown>>;\n\n        views.push({\n            key: relationKey,\n            collection: (relation.overrides ? mergeDeep(base, relation.overrides) : base) as CollectionConfig<Record<string, unknown>>,\n            source: {\n                kind: \"relation\",\n                relationKey,\n                mode: isJunctionBackedRelation(relation) ? \"linked\" : \"owned\",\n                targetSlug: target.slug\n            }\n        });\n    }\n\n    return views;\n}\n\n/**\n * Each of `collection`'s tabs paired with the property that declared it, when a\n * property declared it: child view key → property key.\n *\n * A many-relation can only be declared as a property — that is the documented\n * and only mechanism — and {@link getEntityChildViews} promotes it to a tab. So\n * one declaration reaches the panel twice, and neither surface knew about the\n * other. The form rendered a relation picker beside the tab, and the collection\n * table rendered *two* columns under one heading: the relation's own column,\n * showing the child rows, and a jump-to-tab button carrying the same name.\n *\n * The pairing is what lets each surface decide which half is redundant, and it\n * has to be a pairing rather than two sets because the two keys differ whenever\n * a relation is named. The match is on the resolved `relationName` — the\n * identity `getEntityChildViews` itself dedupes on — so a relation declared in\n * `relations` and pointed at by a differently-named property is recognised too.\n *\n * A relation with no property of its own is absent here, which is the point: it\n * has exactly one surface already, and nothing to weigh it against.\n *\n * Only top-level properties: a relation nested inside a `map` gets no tab.\n */\nexport function getChildViewDeclaringProperties<M extends Record<string, unknown> = Record<string, unknown>>(\n    collection: CollectionConfig<M>\n): Map<string, string> {\n    const pairs = new Map<string, string>();\n\n    const relationProperties = Object.entries((collection.properties ?? {}) as Record<string, Property>)\n        .filter(([, property]) => property?.type === \"relation\");\n    if (relationProperties.length === 0) return pairs;\n\n    const relationViews = getEntityChildViews(collection)\n        .filter(view => view.source.kind === \"relation\");\n    if (relationViews.length === 0) return pairs;\n\n    const resolvedRelations = resolveCollectionRelations(collection);\n    const identityOf = (relationKey: string): string =>\n        resolvedRelations[relationKey]?.relationName ?? relationKey;\n\n    const declaringPropertyByIdentity = new Map<string, string>();\n    for (const [propertyKey, property] of relationProperties) {\n        const relation = (property as RelationProperty).resolvedRelation ?? resolvedRelations[propertyKey];\n        // A to-one relation is a foreign key the author edits, never a tab. No\n        // view will match it — the views here are many-relations only — but\n        // reading the cardinality says so where someone is looking.\n        if (relation?.cardinality !== \"many\") continue;\n        const identity = relation.relationName ?? propertyKey;\n        if (!declaringPropertyByIdentity.has(identity)) declaringPropertyByIdentity.set(identity, propertyKey);\n    }\n\n    for (const view of relationViews) {\n        const propertyKey = declaringPropertyByIdentity.get(\n            identityOf((view.source as { relationKey: string }).relationKey));\n        if (propertyKey) pairs.set(view.key, propertyKey);\n    }\n\n    return pairs;\n}\n\n/**\n * The property keys of `collection` whose relation is already one of its tabs.\n *\n * What a form asks: the tab is the treatment for a list of child rows, so the\n * picker beside it is the redundant half. See\n * {@link getChildViewDeclaringProperties}.\n */\nexport function getChildViewRelationPropertyKeys<M extends Record<string, unknown> = Record<string, unknown>>(\n    collection: CollectionConfig<M>\n): Set<string> {\n    return new Set(getChildViewDeclaringProperties(collection).values());\n}\n\n/**\n * The child views of `collection` as bare collections.\n *\n * The flattened view of {@link getEntityChildViews}, for navigation code that\n * only needs to match a path segment against a slug. Anything that cares *what\n * kind* of list it is showing — chiefly the admin, which must not offer a\n * global delete on a shared row — should read the views instead.\n */\nexport function getSubcollections<M extends Record<string, unknown> = Record<string, unknown>>(collection: CollectionConfig<M>): CollectionConfig<Record<string, unknown>>[] {\n    return getEntityChildViews(collection).map(view => view.collection);\n}\n"],"mappings":"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"}

package/dist/util/storage.es.js

@@ -57,7 +57,7 @@ async function resolveStorageFilenameString({ input, storage, values, entityId,
 	if (typeof input === "function") {
 		result = await input({
 			path,
-			entityId,
+			id: entityId,
 			values,
 			property,
 			file,
@@ -80,7 +80,7 @@ function resolveStoragePathString({ input, storage, values, entityId, path, prop
 	if (typeof input === "function") {
 		result = input({
 			path,
-			entityId,
+			id: entityId,
 			values,
 			property,
 			file,
@@ -101,7 +101,7 @@ function resolveStoragePathString({ input, storage, values, entityId, path, prop
 function replacePlaceholders({ file, input, entityId, propertyKey, path }) {
 	const ext = file.name.split(".").pop();
 	let result = input.replace("{propertyKey}", propertyKey).replace("{rand}", randomString()).replace("{file}", file.name).replace("{file.type}", file.type);
-	if (entityId) result = result.replace("{entityId}", String(entityId));
+	if (entityId) result = result.replace("{id}", String(entityId)).replace("{entityId}", String(entityId));
 	if (path) result = result.replace("{path}", path);
 	if (ext) {
 		result = result.replace("{file.ext}", ext);

package/dist/util/storage.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.es.js","names":[],"sources":["../../src/util/storage.ts"],"sourcesContent":["import { ArrayProperty, DEFAULT_STORAGE_SOURCE_KEY, EntityValues, StorageConfig, StorageSource, StorageSourceRegistry, StringProperty, UploadedFileContext } from \"@rebasepro/types\";\nimport { randomString } from \"@rebasepro/utils\";\n\n/**\n * Resolve the {@link StorageSource} to use for a property, given the key\n * referenced by `StorageConfig.storageSource`.\n *\n * Resolution priority:\n * 1. No `sourceKey` → the default source.\n * 2. An explicit {@link StorageSourceRegistry} that has the key (e.g. `client.storageRegistry`).\n * 3. A `sources` lookup map (e.g. the `StorageSourcesContext`).\n * 4. `(default)` → the default source.\n * 5. `createSource(key)` — a server-routed source carrying `storageId`, so the\n *    server decides: it serves the source, or answers 400/501 naming it.\n * 6. Otherwise a source that refuses every call, naming the key.\n *\n * Never the default source for a key that names another. It used to be: a\n * named source enters the panel's map only once `GET /storage/sources` has\n * answered, so one failed fetch (or a typo, or a `direct` source the app did\n * not pass) silently uploaded the property's files into the default bucket —\n * with the authorize hook asked about `(default)` and the preview looking in\n * the wrong place. The server stopped falling back for the same reason.\n *\n * Shared by the upload hook, the markdown editor, and the read-only previews\n * so the resolution logic lives in one place.\n *\n * @group Storage\n */\nexport function resolveStorageSource(params: {\n    /** Key from `StorageConfig.storageSource`. */\n    sourceKey?: string | null;\n    /** Built sources keyed by storage-source key (e.g. from context). */\n    sources?: Record<string, StorageSource>;\n    /** Optional explicit registry — takes precedence over `sources`. */\n    registry?: StorageSourceRegistry;\n    /** Default source, used when no key is set. */\n    defaultSource: StorageSource;\n    /**\n     * Builds a server-routed source for a key nothing else resolves\n     * (`client.createStorageSource`).\n     */\n    createSource?: (key: string) => StorageSource;\n}): StorageSource {\n    const { sourceKey, sources, registry, defaultSource, createSource } = params;\n    if (!sourceKey) return defaultSource;\n    if (registry?.has(sourceKey)) return registry.getOrDefault(sourceKey);\n    const fromSources = sources?.[sourceKey];\n    if (fromSources) return fromSources;\n    if (sourceKey === DEFAULT_STORAGE_SOURCE_KEY) return defaultSource;\n    if (createSource) return createSource(sourceKey);\n    return unavailableStorageSource(sourceKey);\n}\n\n/**\n * A storage source for a key this app cannot reach: every call fails, naming\n * the key — so an upload is refused instead of landing in another bucket.\n *\n * @group Storage\n */\nexport function unavailableStorageSource(key: string): StorageSource {\n    const refuse = (): Promise<never> => Promise.reject(new Error(\n        `Storage source \"${key}\" is not available in this app. Check the property's ` +\n        \"`storageSource`, that the backend serves it (GET /api/storage/sources), and that a \" +\n        \"`direct` source is passed to <Rebase storageSources>.\"\n    ));\n    return {\n        putObject: refuse,\n        getSignedUrl: refuse,\n        getObject: refuse,\n        deleteObject: refuse,\n        listObjects: refuse\n    };\n}\n\ninterface ResolveFilenameStringParams<M extends Record<string, unknown>> {\n    input: string | ((context: UploadedFileContext) => (Promise<string> | string));\n    storage: StorageConfig;\n    values: EntityValues<M>;\n    entityId?: string | number;\n    path?: string;\n    property: StringProperty | ArrayProperty,\n    file: File;\n    propertyKey: string;\n}\n\nexport async function resolveStorageFilenameString<M extends Record<string, unknown>>(\n    {\n        input,\n        storage,\n        values,\n        entityId,\n        path,\n        property,\n        file,\n        propertyKey\n    }: ResolveFilenameStringParams<M>): Promise<string> {\n    let result;\n\n    if (typeof input === \"function\") {\n        result = await input({\n            path,\n            entityId,\n            values,\n            property,\n            file,\n            storage,\n            propertyKey\n        });\n        if (!result)\n            console.warn(\"Storage callback returned empty result. Using default name value\")\n    } else {\n        result = replacePlaceholders({\n            file,\n            input,\n            entityId,\n            propertyKey,\n            path\n        });\n    }\n\n    if (!result)\n        result = randomString() + \"_\" + file.name;\n\n    return result;\n}\n\ninterface ResolveStoragePathStringParams<M extends Record<string, unknown>> {\n    input: string | ((context: UploadedFileContext) => string);\n    storage: StorageConfig;\n    values: EntityValues<M>;\n    entityId?: string | number;\n    path?: string;\n    property: StringProperty | ArrayProperty;\n    file: File;\n    propertyKey: string;\n}\n\nexport function resolveStoragePathString<M extends Record<string, unknown>>(\n    {\n        input,\n        storage,\n        values,\n        entityId,\n        path,\n        property,\n        file,\n        propertyKey\n    }: ResolveStoragePathStringParams<M>): string {\n    let result;\n    if (typeof input === \"function\") {\n        result = input({\n            path,\n            entityId,\n            values,\n            property,\n            file,\n            storage,\n            propertyKey\n        });\n        if (!result)\n            console.warn(\"Storage callback returned empty result. Using default name value\")\n    } else {\n        result = replacePlaceholders({\n            file,\n            input,\n            entityId,\n            propertyKey,\n            path\n        });\n    }\n\n    if (!result)\n        result = randomString() + \"_\" + file.name;\n\n    return result;\n}\n\ninterface Placeholders {\n    file: File;\n    input: string;\n    entityId?: string | number;\n    propertyKey: string;\n    path?: string;\n}\n\nfunction replacePlaceholders({\n    file,\n    input,\n    entityId,\n    propertyKey,\n    path\n}: Placeholders) {\n    const ext = file.name.split(\".\").pop();\n    let result = input\n        .replace(\"{propertyKey}\", propertyKey)\n        .replace(\"{rand}\", randomString())\n        .replace(\"{file}\", file.name)\n        .replace(\"{file.type}\", file.type);\n    if (entityId) {\n        result = result.replace(\"{entityId}\", String(entityId));\n    }\n    if (path) {\n        result = result.replace(\"{path}\", path);\n    }\n    if (ext) {\n        result = result.replace(\"{file.ext}\", ext);\n        const name = file.name.replace(`.${ext}`, \"\");\n        result = result.replace(\"{file.name}\", name)\n    }\n\n    if (!result)\n        result = randomString() + \"_\" + file.name;\n\n    return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,SAAgB,qBAAqB,QAcnB;CACd,MAAM,EAAE,WAAW,SAAS,UAAU,eAAe,iBAAiB;CACtE,IAAI,CAAC,WAAW,OAAO;CACvB,IAAI,UAAU,IAAI,SAAS,GAAG,OAAO,SAAS,aAAa,SAAS;CACpE,MAAM,cAAc,UAAU;CAC9B,IAAI,aAAa,OAAO;CACxB,IAAI,cAAc,4BAA4B,OAAO;CACrD,IAAI,cAAc,OAAO,aAAa,SAAS;CAC/C,OAAO,yBAAyB,SAAS;AAC7C;;;;;;;AAQA,SAAgB,yBAAyB,KAA4B;CACjE,MAAM,eAA+B,QAAQ,uBAAO,IAAI,MACpD,mBAAmB,IAAI,kMAG3B,CAAC;CACD,OAAO;EACH,WAAW;EACX,cAAc;EACd,WAAW;EACX,cAAc;EACd,aAAa;CACjB;AACJ;AAaA,eAAsB,6BAClB,EACI,OACA,SACA,QACA,UACA,MACA,UACA,MACA,eACgD;CACpD,IAAI;CAEJ,IAAI,OAAO,UAAU,YAAY;EAC7B,SAAS,MAAM,MAAM;GACjB;GACA;GACA;GACA;GACA;GACA;GACA;EACJ,CAAC;EACD,IAAI,CAAC,QACD,QAAQ,KAAK,kEAAkE;CACvF,OACI,SAAS,oBAAoB;EACzB;EACA;EACA;EACA;EACA;CACJ,CAAC;CAGL,IAAI,CAAC,QACD,SAAS,aAAa,IAAI,MAAM,KAAK;CAEzC,OAAO;AACX;AAaA,SAAgB,yBACZ,EACI,OACA,SACA,QACA,UACA,MACA,UACA,MACA,eAC0C;CAC9C,IAAI;CACJ,IAAI,OAAO,UAAU,YAAY;EAC7B,SAAS,MAAM;GACX;GACA;GACA;GACA;GACA;GACA;GACA;EACJ,CAAC;EACD,IAAI,CAAC,QACD,QAAQ,KAAK,kEAAkE;CACvF,OACI,SAAS,oBAAoB;EACzB;EACA;EACA;EACA;EACA;CACJ,CAAC;CAGL,IAAI,CAAC,QACD,SAAS,aAAa,IAAI,MAAM,KAAK;CAEzC,OAAO;AACX;AAUA,SAAS,oBAAoB,EACzB,MACA,OACA,UACA,aACA,QACa;CACb,MAAM,MAAM,KAAK,KAAK,MAAM,GAAG,CAAC,CAAC,IAAI;CACrC,IAAI,SAAS,MACR,QAAQ,iBAAiB,WAAW,CAAC,CACrC,QAAQ,UAAU,aAAa,CAAC,CAAC,CACjC,QAAQ,UAAU,KAAK,IAAI,CAAC,CAC5B,QAAQ,eAAe,KAAK,IAAI;CACrC,IAAI,UACA,SAAS,OAAO,QAAQ,cAAc,OAAO,QAAQ,CAAC;CAE1D,IAAI,MACA,SAAS,OAAO,QAAQ,UAAU,IAAI;CAE1C,IAAI,KAAK;EACL,SAAS,OAAO,QAAQ,cAAc,GAAG;EACzC,MAAM,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,EAAE;EAC5C,SAAS,OAAO,QAAQ,eAAe,IAAI;CAC/C;CAEA,IAAI,CAAC,QACD,SAAS,aAAa,IAAI,MAAM,KAAK;CAEzC,OAAO;AACX"}
+{"version":3,"file":"storage.es.js","names":[],"sources":["../../src/util/storage.ts"],"sourcesContent":["import { ArrayProperty, DEFAULT_STORAGE_SOURCE_KEY, EntityValues, StorageConfig, StorageSource, StorageSourceRegistry, StringProperty, UploadedFileContext } from \"@rebasepro/types\";\nimport { randomString } from \"@rebasepro/utils\";\n\n/**\n * Resolve the {@link StorageSource} to use for a property, given the key\n * referenced by `StorageConfig.storageSource`.\n *\n * Resolution priority:\n * 1. No `sourceKey` → the default source.\n * 2. An explicit {@link StorageSourceRegistry} that has the key (e.g. `client.storageRegistry`).\n * 3. A `sources` lookup map (e.g. the `StorageSourcesContext`).\n * 4. `(default)` → the default source.\n * 5. `createSource(key)` — a server-routed source carrying `storageId`, so the\n *    server decides: it serves the source, or answers 400/501 naming it.\n * 6. Otherwise a source that refuses every call, naming the key.\n *\n * Never the default source for a key that names another. It used to be: a\n * named source enters the panel's map only once `GET /storage/sources` has\n * answered, so one failed fetch (or a typo, or a `direct` source the app did\n * not pass) silently uploaded the property's files into the default bucket —\n * with the authorize hook asked about `(default)` and the preview looking in\n * the wrong place. The server stopped falling back for the same reason.\n *\n * Shared by the upload hook, the markdown editor, and the read-only previews\n * so the resolution logic lives in one place.\n *\n * @group Storage\n */\nexport function resolveStorageSource(params: {\n    /** Key from `StorageConfig.storageSource`. */\n    sourceKey?: string | null;\n    /** Built sources keyed by storage-source key (e.g. from context). */\n    sources?: Record<string, StorageSource>;\n    /** Optional explicit registry — takes precedence over `sources`. */\n    registry?: StorageSourceRegistry;\n    /** Default source, used when no key is set. */\n    defaultSource: StorageSource;\n    /**\n     * Builds a server-routed source for a key nothing else resolves\n     * (`client.createStorageSource`).\n     */\n    createSource?: (key: string) => StorageSource;\n}): StorageSource {\n    const { sourceKey, sources, registry, defaultSource, createSource } = params;\n    if (!sourceKey) return defaultSource;\n    if (registry?.has(sourceKey)) return registry.getOrDefault(sourceKey);\n    const fromSources = sources?.[sourceKey];\n    if (fromSources) return fromSources;\n    if (sourceKey === DEFAULT_STORAGE_SOURCE_KEY) return defaultSource;\n    if (createSource) return createSource(sourceKey);\n    return unavailableStorageSource(sourceKey);\n}\n\n/**\n * A storage source for a key this app cannot reach: every call fails, naming\n * the key — so an upload is refused instead of landing in another bucket.\n *\n * @group Storage\n */\nexport function unavailableStorageSource(key: string): StorageSource {\n    const refuse = (): Promise<never> => Promise.reject(new Error(\n        `Storage source \"${key}\" is not available in this app. Check the property's ` +\n        \"`storageSource`, that the backend serves it (GET /api/storage/sources), and that a \" +\n        \"`direct` source is passed to <Rebase storageSources>.\"\n    ));\n    return {\n        putObject: refuse,\n        getSignedUrl: refuse,\n        getObject: refuse,\n        deleteObject: refuse,\n        listObjects: refuse\n    };\n}\n\ninterface ResolveFilenameStringParams<M extends Record<string, unknown>> {\n    input: string | ((context: UploadedFileContext) => (Promise<string> | string));\n    storage: StorageConfig;\n    values: EntityValues<M>;\n    entityId?: string | number;\n    path?: string;\n    property: StringProperty | ArrayProperty,\n    file: File;\n    propertyKey: string;\n}\n\nexport async function resolveStorageFilenameString<M extends Record<string, unknown>>(\n    {\n        input,\n        storage,\n        values,\n        entityId,\n        path,\n        property,\n        file,\n        propertyKey\n    }: ResolveFilenameStringParams<M>): Promise<string> {\n    let result;\n\n    if (typeof input === \"function\") {\n        result = await input({\n            path,\n            id: entityId,\n            values,\n            property,\n            file,\n            storage,\n            propertyKey\n        });\n        if (!result)\n            console.warn(\"Storage callback returned empty result. Using default name value\")\n    } else {\n        result = replacePlaceholders({\n            file,\n            input,\n            entityId,\n            propertyKey,\n            path\n        });\n    }\n\n    if (!result)\n        result = randomString() + \"_\" + file.name;\n\n    return result;\n}\n\ninterface ResolveStoragePathStringParams<M extends Record<string, unknown>> {\n    input: string | ((context: UploadedFileContext) => string);\n    storage: StorageConfig;\n    values: EntityValues<M>;\n    entityId?: string | number;\n    path?: string;\n    property: StringProperty | ArrayProperty;\n    file: File;\n    propertyKey: string;\n}\n\nexport function resolveStoragePathString<M extends Record<string, unknown>>(\n    {\n        input,\n        storage,\n        values,\n        entityId,\n        path,\n        property,\n        file,\n        propertyKey\n    }: ResolveStoragePathStringParams<M>): string {\n    let result;\n    if (typeof input === \"function\") {\n        result = input({\n            path,\n            id: entityId,\n            values,\n            property,\n            file,\n            storage,\n            propertyKey\n        });\n        if (!result)\n            console.warn(\"Storage callback returned empty result. Using default name value\")\n    } else {\n        result = replacePlaceholders({\n            file,\n            input,\n            entityId,\n            propertyKey,\n            path\n        });\n    }\n\n    if (!result)\n        result = randomString() + \"_\" + file.name;\n\n    return result;\n}\n\ninterface Placeholders {\n    file: File;\n    input: string;\n    entityId?: string | number;\n    propertyKey: string;\n    path?: string;\n}\n\nfunction replacePlaceholders({\n    file,\n    input,\n    entityId,\n    propertyKey,\n    path\n}: Placeholders) {\n    const ext = file.name.split(\".\").pop();\n    let result = input\n        .replace(\"{propertyKey}\", propertyKey)\n        .replace(\"{rand}\", randomString())\n        .replace(\"{file}\", file.name)\n        .replace(\"{file.type}\", file.type);\n    if (entityId) {\n        // `{entityId}` is how configs written before `{id}` spell it, and a\n        // stored path keeps meaning what it meant.\n        result = result.replace(\"{id}\", String(entityId)).replace(\"{entityId}\", String(entityId));\n    }\n    if (path) {\n        result = result.replace(\"{path}\", path);\n    }\n    if (ext) {\n        result = result.replace(\"{file.ext}\", ext);\n        const name = file.name.replace(`.${ext}`, \"\");\n        result = result.replace(\"{file.name}\", name)\n    }\n\n    if (!result)\n        result = randomString() + \"_\" + file.name;\n\n    return result;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,SAAgB,qBAAqB,QAcnB;CACd,MAAM,EAAE,WAAW,SAAS,UAAU,eAAe,iBAAiB;CACtE,IAAI,CAAC,WAAW,OAAO;CACvB,IAAI,UAAU,IAAI,SAAS,GAAG,OAAO,SAAS,aAAa,SAAS;CACpE,MAAM,cAAc,UAAU;CAC9B,IAAI,aAAa,OAAO;CACxB,IAAI,cAAc,4BAA4B,OAAO;CACrD,IAAI,cAAc,OAAO,aAAa,SAAS;CAC/C,OAAO,yBAAyB,SAAS;AAC7C;;;;;;;AAQA,SAAgB,yBAAyB,KAA4B;CACjE,MAAM,eAA+B,QAAQ,uBAAO,IAAI,MACpD,mBAAmB,IAAI,kMAG3B,CAAC;CACD,OAAO;EACH,WAAW;EACX,cAAc;EACd,WAAW;EACX,cAAc;EACd,aAAa;CACjB;AACJ;AAaA,eAAsB,6BAClB,EACI,OACA,SACA,QACA,UACA,MACA,UACA,MACA,eACgD;CACpD,IAAI;CAEJ,IAAI,OAAO,UAAU,YAAY;EAC7B,SAAS,MAAM,MAAM;GACjB;GACA,IAAI;GACJ;GACA;GACA;GACA;GACA;EACJ,CAAC;EACD,IAAI,CAAC,QACD,QAAQ,KAAK,kEAAkE;CACvF,OACI,SAAS,oBAAoB;EACzB;EACA;EACA;EACA;EACA;CACJ,CAAC;CAGL,IAAI,CAAC,QACD,SAAS,aAAa,IAAI,MAAM,KAAK;CAEzC,OAAO;AACX;AAaA,SAAgB,yBACZ,EACI,OACA,SACA,QACA,UACA,MACA,UACA,MACA,eAC0C;CAC9C,IAAI;CACJ,IAAI,OAAO,UAAU,YAAY;EAC7B,SAAS,MAAM;GACX;GACA,IAAI;GACJ;GACA;GACA;GACA;GACA;EACJ,CAAC;EACD,IAAI,CAAC,QACD,QAAQ,KAAK,kEAAkE;CACvF,OACI,SAAS,oBAAoB;EACzB;EACA;EACA;EACA;EACA;CACJ,CAAC;CAGL,IAAI,CAAC,QACD,SAAS,aAAa,IAAI,MAAM,KAAK;CAEzC,OAAO;AACX;AAUA,SAAS,oBAAoB,EACzB,MACA,OACA,UACA,aACA,QACa;CACb,MAAM,MAAM,KAAK,KAAK,MAAM,GAAG,CAAC,CAAC,IAAI;CACrC,IAAI,SAAS,MACR,QAAQ,iBAAiB,WAAW,CAAC,CACrC,QAAQ,UAAU,aAAa,CAAC,CAAC,CACjC,QAAQ,UAAU,KAAK,IAAI,CAAC,CAC5B,QAAQ,eAAe,KAAK,IAAI;CACrC,IAAI,UAGA,SAAS,OAAO,QAAQ,QAAQ,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,cAAc,OAAO,QAAQ,CAAC;CAE5F,IAAI,MACA,SAAS,OAAO,QAAQ,UAAU,IAAI;CAE1C,IAAI,KAAK;EACL,SAAS,OAAO,QAAQ,cAAc,GAAG;EACzC,MAAM,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,EAAE;EAC5C,SAAS,OAAO,QAAQ,eAAe,IAAI;CAC/C;CAEA,IAAI,CAAC,QACD,SAAS,aAAa,IAAI,MAAM,KAAK;CAEzC,OAAO;AACX"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebasepro/common",
-  "version": "0.28.2",
+  "version": "0.29.0-canary.g0e3a0e7",
   "description": "Rebase shared core — collection registry, data driver adapter and fluent query builder. No React dependency.",
   "keywords": [
     "rebase",
@@ -46,8 +46,8 @@
   "dependencies": {
     "fast-equals": "6.0.2",
     "json-logic-js": "^2.0.5",
-    "@rebasepro/types": "0.28.2",
-    "@rebasepro/utils": "0.28.2"
+    "@rebasepro/types": "0.29.0-canary.g0e3a0e7",
+    "@rebasepro/utils": "0.29.0-canary.g0e3a0e7"
   },
   "devDependencies": {
     "@jest/globals": "^30.4.1",