@rakun-kit/core 1.5.13 → 1.6.0

package/dist/esm/api/routes/web/staticPaths.js

@@ -1,6 +1,7 @@
 import { Route, RouteMap } from '../../../internal-content-types/index.js';
 import { DEFAULT_STATIC_PAGE_TTL } from '../../../schemas/web/page.js';
 import { getMongoService } from '../../../orm/index.js';
+import { filterVisibleRouteMapEntries } from '../../utils/routes/routeMapHelpers.js';
 export const buildStaticPathsOutput = (routes, routeMap) => {
     const staticRouteIds = new Set(routes
         .filter((route) => route.hasPage && route.dynamic === false)
@@ -27,10 +28,11 @@ export const getStaticPaths = async () => {
         db.list(RouteMap, {
             options: {
                 limit: 'all',
-                fields: ['path', 'routeId'],
+                fields: ['path', 'routeId', 'contentType', 'contentTypeId'],
             },
         }),
     ]);
-    return buildStaticPathsOutput(routes.items, routeMap.items);
+    const visibleRouteMap = await filterVisibleRouteMapEntries(db, routeMap.items);
+    return buildStaticPathsOutput(routes.items, visibleRouteMap);
 };
 //# sourceMappingURL=staticPaths.js.map

package/dist/esm/api/routes/web/staticPaths.js.map

@@ -1 +1 @@
-{"version":3,"file":"staticPaths.js","sourceRoot":"","sources":["../../../../../src/api/routes/web/staticPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAGnE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,MAAkC,EAClC,QAAuC,EACpB,EAAE;IACrB,MAAM,cAAc,GAAG,IAAI,GAAG,CAC5B,MAAM;SACH,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC;SAC3D,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CACrC,CAAA;IAED,OAAO;QACL,KAAK,EAAE,QAAQ;aACZ,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;aAC1D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACd,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,uBAAuB;SAC7B,CAAC,CAAC;aACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;KAChD,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,IAAgC,EAAE;IACnE,MAAM,EAAE,GAAG,MAAM,eAAe,EAAE,CAAA;IAClC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC3C,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,OAAO,EAAE;gBACP,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;aAC/B;SACF,CAAC;QACF,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChB,OAAO,EAAE;gBACP,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;aAC5B;SACF,CAAC;KACH,CAAC,CAAA;IAEF,OAAO,sBAAsB,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;AAC7D,CAAC,CAAA"}
+{"version":3,"file":"staticPaths.js","sourceRoot":"","sources":["../../../../../src/api/routes/web/staticPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAGnE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,4BAA4B,EAAE,MAAM,oCAAoC,CAAA;AAEjF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,MAAkC,EAClC,QAAuC,EACpB,EAAE;IACrB,MAAM,cAAc,GAAG,IAAI,GAAG,CAC5B,MAAM;SACH,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC;SAC3D,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CACrC,CAAA;IAED,OAAO;QACL,KAAK,EAAE,QAAQ;aACZ,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;aAC1D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACd,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,uBAAuB;SAC7B,CAAC,CAAC;aACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;KAChD,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,IAAgC,EAAE;IACnE,MAAM,EAAE,GAAG,MAAM,eAAe,EAAE,CAAA;IAClC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC3C,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,OAAO,EAAE;gBACP,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;aAC/B;SACF,CAAC;QACF,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE;YAChB,OAAO,EAAE;gBACP,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,CAAC;aAC5D;SACF,CAAC;KACH,CAAC,CAAA;IAEF,MAAM,eAAe,GAAG,MAAM,4BAA4B,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE9E,OAAO,sBAAsB,CAAC,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;AAC9D,CAAC,CAAA"}

package/dist/esm/api/utils/dynamicData.d.ts

@@ -1,7 +1,7 @@
-import type ContentType from "../../lib/ContentType.js";
-import { type DynamicRelatedCollectionSource } from "../../lib/dynamicData.js";
-import type { DataPopulatedWithoutApiOnly, DBOutput } from "../../lib/types/index.js";
-import type { DBService } from "../../orm/dbService.js";
+import type ContentType from '../../lib/ContentType.js';
+import { type DynamicRelatedCollectionSource } from '../../lib/dynamicData.js';
+import type { DataPopulatedWithoutApiOnly, DBOutput } from '../../lib/types/index.js';
+import type { DBService } from '../../orm/dbService.js';
 type ResolveOptions = {
     db: DBService;
     contentType?: ContentType;
@@ -9,7 +9,7 @@ type ResolveOptions = {
         contentType: ContentType;
         value: Record<string, unknown>;
     };
-    surface: "web" | "preview";
+    surface: 'web' | 'preview';
 };
 export declare const resolveRelatedCollectionValue: ({ db, source, currentSource, currentContentType, populateDocument, }: {
     db: DBService;
@@ -20,6 +20,7 @@ export declare const resolveRelatedCollectionValue: ({ db, source, currentSource
 }) => Promise<any[] | undefined>;
 export declare const getDynamicListItemContentTypeName: (field: ContentType["fields"][string] | undefined, itemName: string) => string;
 export declare const mergeDynamicListItems: (currentValue: unknown, resolvedValue: unknown) => unknown[];
+export declare const mergeDynamicArrayItems: (currentValue: unknown, resolvedValue: unknown) => any[];
 export declare const resolveDynamicData: <T>(value: T, options: ResolveOptions) => Promise<T>;
 export declare const stripDynamicBindings: <T>(value: T) => T;
 export declare const resolveContentOutput: <T extends ContentType>({ db, contentType, data, surface, }: {

package/dist/esm/api/utils/dynamicData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamicData.d.ts","sourceRoot":"","sources":["../../../../src/api/utils/dynamicData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAUL,KAAK,8BAA8B,EACpC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,2BAA2B,EAAE,QAAQ,EAAS,MAAM,iBAAiB,CAAC;AAEpF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AASrD,KAAK,cAAc,GAAG;IACpB,EAAE,EAAE,SAAS,CAAC;IACd,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,aAAa,CAAC,EAAE;QACd,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAChC,CAAC;IACF,OAAO,EAAE,KAAK,GAAG,SAAS,CAAC;CAC5B,CAAC;AAgWF,eAAO,MAAM,6BAA6B,GAAU,sEASjD;IACD,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,EAAE,8BAA8B,CAAC;IACvC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,kBAAkB,EAAE,WAAW,CAAC;IAChC,gBAAgB,CAAC,EAAE,CACjB,UAAU,EAAE,QAAQ,CAAC,WAAW,CAAC,KAC9B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACvC,+BA6CA,CAAC;AAqNF,eAAO,MAAM,iCAAiC,GAC5C,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,EAChD,UAAU,MAAM,WAC8C,CAAC;AAiFjE,eAAO,MAAM,qBAAqB,GAChC,cAAc,OAAO,EACrB,eAAe,OAAO,cAsBvB,CAAC;AAkEF,eAAO,MAAM,kBAAkB,GAAU,CAAC,EACxC,OAAO,CAAC,EACR,SAAS,cAAc,KACtB,OAAO,CAAC,CAAC,CA2CX,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,CAAC,EAAE,OAAO,CAAC,KAAG,CAYlD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAU,CAAC,SAAS,WAAW,EAAE,qCAK/D;IACD,EAAE,EAAE,SAAS,CAAC;IACd,WAAW,EAAE,CAAC,CAAC;IACf,IAAI,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC;IACrC,OAAO,EAAE,KAAK,GAAG,SAAS,CAAC;CAC5B,uj5mBAiBA,CAAC"}
+{"version":3,"file":"dynamicData.d.ts","sourceRoot":"","sources":["../../../../src/api/utils/dynamicData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAUL,KAAK,8BAA8B,EACpC,MAAM,uBAAuB,CAAA;AAE9B,OAAO,KAAK,EAAE,2BAA2B,EAAE,QAAQ,EAAS,MAAM,iBAAiB,CAAA;AAEnF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AASpD,KAAK,cAAc,GAAG;IACpB,EAAE,EAAE,SAAS,CAAA;IACb,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,aAAa,CAAC,EAAE;QACd,WAAW,EAAE,WAAW,CAAA;QACxB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC/B,CAAA;IACD,OAAO,EAAE,KAAK,GAAG,SAAS,CAAA;CAC3B,CAAA;AA6UD,eAAO,MAAM,6BAA6B,GAAU,sEAOjD;IACD,EAAE,EAAE,SAAS,CAAA;IACb,MAAM,EAAE,8BAA8B,CAAA;IACtC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACtC,kBAAkB,EAAE,WAAW,CAAA;IAC/B,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CAC3F,+BA2CA,CAAA;AA+PD,eAAO,MAAM,iCAAiC,GAC5C,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,EAChD,UAAU,MAAM,WAIjB,CAAA;AAyED,eAAO,MAAM,qBAAqB,GAAI,cAAc,OAAO,EAAE,eAAe,OAAO,cAiBlF,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,cAAc,OAAO,EAAE,eAAe,OAAO,UAYnF,CAAA;AAiED,eAAO,MAAM,kBAAkB,GAAU,CAAC,EAAE,OAAO,CAAC,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,CAAC,CAuCxF,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,CAAC,EAAE,OAAO,CAAC,KAAG,CAYlD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAU,CAAC,SAAS,WAAW,EAAE,qCAK/D;IACD,EAAE,EAAE,SAAS,CAAA;IACb,WAAW,EAAE,CAAC,CAAA;IACd,IAAI,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAA;IACpC,OAAO,EAAE,KAAK,GAAG,SAAS,CAAA;CAC3B,uj5mBAiBA,CAAA"}

package/dist/esm/api/utils/dynamicData.js

@@ -1,105 +1,113 @@
-import { getRakunBootstrapOptions } from "../../bootstrapState.js";
-import { DYNAMIC_BINDINGS_FIELD_NAME, DynamicQueryCurrentValueSchema, DynamicQueryDocumentValueSchema, getDynamicDocumentBindings, isDynamicDataSourceContentTypeAllowed, } from "../../lib/dynamicData.js";
-import { Logger } from "../../lib/Logger.js";
-import { getContentTypeByName } from "../../lib/Registry.js";
-import { runOnGetHook } from "../hooks/runContentHooks.js";
-import { getLink } from "./getLink.js";
-import { populateLinks } from "./populates/populateLinks.js";
-import { populateRelations } from "./populates/populateRelations.js";
-import { parseSafeManagerQuery } from "./safeManagerQuery.js";
+import { getRakunBootstrapOptions } from '../../bootstrapState.js';
+import { DYNAMIC_BINDINGS_FIELD_NAME, DynamicQueryCurrentValueSchema, DynamicQueryDocumentValueSchema, getDynamicDocumentBindings, isDynamicDataSourceContentTypeAllowed, } from '../../lib/dynamicData.js';
+import { Logger } from '../../lib/Logger.js';
+import { getContentTypeByName } from '../../lib/Registry.js';
+import { runOnGetHook } from '../hooks/runContentHooks.js';
+import { getLink } from './getLink.js';
+import { populateFields } from './populates/populateLinks.js';
+import { populateRelations } from './populates/populateRelations.js';
+import { parseSafeManagerQuery } from './safeManagerQuery.js';
 import { getContentHookContext } from '../hooks/context.js';
 import { resolveBreadcrumsFields } from './breadcrums.js';
-const isRecord = (value) => !!value &&
-    typeof value === "object" &&
-    !Array.isArray(value) &&
-    !(value instanceof Date);
+const isRecord = (value) => !!value && typeof value === 'object' && !Array.isArray(value) && !(value instanceof Date);
 const getAtPath = (value, path) => {
     if (!path)
         return undefined;
-    return path.split(".").reduce((current, segment) => {
+    return path.split('.').reduce((current, segment) => {
         if (!isRecord(current))
             return undefined;
         return current[segment];
     }, value);
 };
-const isPublicDocument = (value) => value._trashed !== true &&
-    value._visibility !== "draft" &&
-    value._visibility !== "trash";
+const setAtPath = (target, path, value) => {
+    const segments = path.split('.');
+    let current = target;
+    for (const [index, segment] of segments.entries()) {
+        if (index === segments.length - 1) {
+            Object.defineProperty(current, segment, {
+                configurable: true,
+                enumerable: true,
+                value,
+                writable: true,
+            });
+            return;
+        }
+        const existing = current[segment];
+        const next = isRecord(existing) ? existing : {};
+        if (next !== existing) {
+            Object.defineProperty(current, segment, {
+                configurable: true,
+                enumerable: true,
+                value: next,
+                writable: true,
+            });
+        }
+        current = next;
+    }
+};
+const isPublicDocument = (value) => value._trashed !== true && value._visibility !== 'draft' && value._visibility !== 'trash';
 const getAllowedSourceContentType = (sourceContentTypeName) => {
     const contentType = getContentTypeByName(sourceContentTypeName);
-    return isDynamicDataSourceContentTypeAllowed(contentType)
-        ? contentType
+    return isDynamicDataSourceContentTypeAllowed(contentType) ? contentType : undefined;
+};
+const getDynamicTargetField = (contentType, path) => {
+    const [fieldName, ...rest] = path.split('.');
+    const field = contentType.fields[fieldName];
+    if (!field || !contentType.allowsDynamicBindingForField(fieldName)) {
+        return undefined;
+    }
+    if (rest.length === 0)
+        return field;
+    return rest.length === 1 &&
+        field.meta.capabilities.dynamic?.mapProperties === true &&
+        field.meta.capabilities.dynamic?.properties?.[rest[0]]
+        ? field
         : undefined;
 };
-const fileSourcePaths = new Set([
-    "url",
-    "previewUrl",
-    "name",
-    "title",
-    "alt",
-    "mime",
-    "srcSet",
-    "width",
-    "height",
-    "size",
-]);
-const linkSourcePaths = new Set(["href", "title"]);
 const isDynamicSourcePathAllowed = (contentType, path, depth = 0) => {
     if (!path)
         return false;
-    const [fieldName, ...rest] = path.split(".");
+    const [fieldName, ...rest] = path.split('.');
     const field = contentType.fields[fieldName];
     if (!field || !contentType.allowsDynamicBindingForField(fieldName)) {
         return false;
     }
     if (rest.length === 0)
         return true;
-    if (field.meta.type === "Relation" &&
-        "contentType" in field &&
-        depth < 3) {
-        return isDynamicSourcePathAllowed(field.contentType, rest.join("."), depth + 1);
-    }
-    if (field.meta.type === "File") {
-        return rest.length === 1 && fileSourcePaths.has(rest[0]);
-    }
-    if (field.meta.type === "Link") {
-        return rest.length === 1 && linkSourcePaths.has(rest[0]);
+    if (field.meta.capabilities.dynamic?.relation === true && 'contentType' in field && depth < 3) {
+        return isDynamicSourcePathAllowed(field.contentType, rest.join('.'), depth + 1);
     }
-    return false;
+    return rest.length === 1 && !!field.meta.capabilities.dynamic?.properties?.[rest[0]];
 };
 const getDynamicSourceField = (contentType, path, depth = 0) => {
     if (!path)
         return undefined;
-    const [fieldName, ...rest] = path.split(".");
+    const [fieldName, ...rest] = path.split('.');
     const field = contentType.fields[fieldName];
     if (!field || !contentType.allowsDynamicBindingForField(fieldName)) {
         return undefined;
     }
     if (rest.length === 0)
         return field;
-    if (field.meta.type === "Relation" &&
-        "contentType" in field &&
-        depth < 3) {
-        return getDynamicSourceField(field.contentType, rest.join("."), depth + 1);
+    if (field.meta.capabilities.dynamic?.relation === true && 'contentType' in field && depth < 3) {
+        return getDynamicSourceField(field.contentType, rest.join('.'), depth + 1);
     }
     return undefined;
 };
 const isArraySourceField = (field) => {
     if (!field)
         return false;
-    if (field.meta.type === "List")
-        return true;
-    return "isMultiple" in field.meta && field.meta.isMultiple === true;
+    return field.meta.capabilities.valueKind === 'array';
 };
 const getRelationTarget = (field) => {
     if (!field || field.getIsTranslatable())
         return undefined;
-    if (field.meta.type === "Relation" && "contentType" in field) {
+    if (field.meta.capabilities.dynamic?.relation === true && 'contentType' in field) {
         return field.contentType;
     }
-    if (field.meta.ui === "SimpleList" && "field" in field) {
+    if (field.meta.capabilities.dynamic?.collection === 'homogeneous' && 'field' in field) {
         const itemField = field.field;
-        if (itemField.meta.type === "Relation" && "contentType" in itemField) {
+        if (itemField.meta.capabilities.dynamic?.relation === true && 'contentType' in itemField) {
             return itemField.contentType;
         }
     }
@@ -109,8 +117,8 @@ const getDocumentListItemContentType = (field, itemName) => {
     if (!field || !isArraySourceField(field) || field.getIsTranslatable()) {
         return undefined;
     }
-    if ((field.meta.ui === "List" || field.meta.ui === "Iterator") &&
-        "fields" in field &&
+    if (field.meta.capabilities.dynamic?.collection === 'heterogeneous' &&
+        'fields' in field &&
         Array.isArray(field.fields)) {
         if (!itemName)
             return undefined;
@@ -140,7 +148,7 @@ const loadSourceDocument = async (db, source) => {
     if (!item || !isPublicDocument(item)) {
         return undefined;
     }
-    return (await populateRelations(await populateLinks(item)));
+    return (await populateRelations(await populateFields(item)));
 };
 const resolveSourceValue = async ({ db, source, currentSource, currentContentType, allowCurrentSource, contextSource, }) => {
     const usesCurrentRecord = allowCurrentSource === true &&
@@ -163,8 +171,8 @@ const resolveSourceValue = async ({ db, source, currentSource, currentContentTyp
             : await loadSourceDocument(db, source);
     if (!sourceDocument)
         return undefined;
-    if (source.virtual === "href") {
-        const sourceId = typeof sourceDocument._id === "string" ? sourceDocument._id : source.id;
+    if (source.virtual === 'href') {
+        const sourceId = typeof sourceDocument._id === 'string' ? sourceDocument._id : source.id;
         return sourceId ? await resolveHref(source, sourceId) : undefined;
     }
     if (!isDynamicSourcePathAllowed(sourceContentType, source.path)) {
@@ -172,17 +180,17 @@ const resolveSourceValue = async ({ db, source, currentSource, currentContentTyp
     }
     return getAtPath(sourceDocument, source.path);
 };
-const isRelatedCollectionSource = (source) => "kind" in source && source.kind === "relatedCollection";
-const isNestedListSource = (source) => "kind" in source && source.kind === "list";
+const isRelatedCollectionSource = (source) => 'kind' in source && source.kind === 'relatedCollection';
+const isNestedListSource = (source) => 'kind' in source && source.kind === 'list';
 const addPublicContentFilter = (query) => ({
     ...query,
     filter: {
         ...query.filter,
         _trashed: { $ne: true },
-        _visibility: { $nin: ["draft", "trash"] },
+        _visibility: { $nin: ['draft', 'trash'] },
     },
 });
-const isDynamicQueryCurrentPathAllowed = (contentType, path) => path === "_id" || isDynamicSourcePathAllowed(contentType, path);
+const isDynamicQueryCurrentPathAllowed = (contentType, path) => path === '_id' || isDynamicSourcePathAllowed(contentType, path);
 const resolveDynamicQueryValue = (value, currentItem, currentItemContentType, currentDocument, currentDocumentContentType) => {
     const currentValue = DynamicQueryCurrentValueSchema.safeParse(value);
     if (currentValue.success) {
@@ -191,9 +199,7 @@ const resolveDynamicQueryValue = (value, currentItem, currentItemContentType, cu
             return { success: false };
         }
         const resolved = getAtPath(currentItem, path);
-        return resolved === undefined
-            ? { success: false }
-            : { success: true, value: resolved };
+        return resolved === undefined ? { success: false } : { success: true, value: resolved };
     }
     const documentValue = DynamicQueryDocumentValueSchema.safeParse(value);
     if (documentValue.success) {
@@ -202,9 +208,7 @@ const resolveDynamicQueryValue = (value, currentItem, currentItemContentType, cu
             return { success: false };
         }
         const resolved = getAtPath(currentDocument, path);
-        return resolved === undefined
-            ? { success: false }
-            : { success: true, value: resolved };
+        return resolved === undefined ? { success: false } : { success: true, value: resolved };
     }
     if (Array.isArray(value)) {
         const items = [];
@@ -228,12 +232,12 @@ const resolveDynamicQueryValue = (value, currentItem, currentItemContentType, cu
     }
     return { success: true, value };
 };
-export const resolveRelatedCollectionValue = async ({ db, source, currentSource, currentContentType, populateDocument = async (sourceItem) => (await populateRelations(await populateLinks(sourceItem))), }) => {
+export const resolveRelatedCollectionValue = async ({ db, source, currentSource, currentContentType, populateDocument = async (sourceItem) => (await populateRelations(await populateFields(sourceItem))), }) => {
     if (!isDynamicDataSourceContentTypeAllowed(currentContentType)) {
         return undefined;
     }
     const sourceId = currentSource._id;
-    if (typeof sourceId !== "string")
+    if (typeof sourceId !== 'string')
         return undefined;
     const relatedContentType = getAllowedSourceContentType(source.contentType);
     if (!relatedContentType)
@@ -264,16 +268,16 @@ export const resolveRelatedCollectionValue = async ({ db, source, currentSource,
 };
 const resolveListMapSourceValue = async ({ db, source, targetField, currentSource, currentContentType, contextSource, }) => {
     if (isNestedListSource(source)) {
-        const targetContentType = getListTargetContentType(targetField, source.itemName);
-        if (!targetContentType)
+        if (!targetField || !getDynamicListTarget(targetField, source.itemName)) {
             return undefined;
+        }
         return await resolveListBinding({
             db,
             binding: source,
             contextSource,
             currentDocument: currentSource,
             currentDocumentContentType: currentContentType,
-            itemContentTypeName: targetContentType.name,
+            targetField,
         });
     }
     if (isRelatedCollectionSource(source)) {
@@ -293,7 +297,7 @@ const resolveListMapSourceValue = async ({ db, source, targetField, currentSourc
         contextSource,
     });
 };
-const resolveListBinding = async ({ db, binding, contextSource, currentDocument, currentDocumentContentType, itemContentTypeName, }) => {
+const resolveListBinding = async ({ db, binding, contextSource, currentDocument, currentDocumentContentType, targetField, }) => {
     const documentSource = binding.source;
     const rootDocumentSource = contextSource ?? {
         contentType: currentDocumentContentType,
@@ -305,6 +309,9 @@ const resolveListBinding = async ({ db, binding, contextSource, currentDocument,
     if (!sourceContentType) {
         return undefined;
     }
+    const target = getDynamicListTarget(targetField, binding.itemName);
+    if (!target)
+        return undefined;
     let sourceItems;
     if (documentSource) {
         if (documentSource.contentType !== currentDocumentContentType.name) {
@@ -319,9 +326,7 @@ const resolveListBinding = async ({ db, binding, contextSource, currentDocument,
         if (!Array.isArray(value))
             return undefined;
         sourceItems = documentSource.itemName
-            ? value.flatMap((item) => isRecord(item) &&
-                item.name === documentSource.itemName &&
-                "value" in item
+            ? value.flatMap((item) => isRecord(item) && item.name === documentSource.itemName && 'value' in item
                 ? [item.value]
                 : [])
             : value;
@@ -342,105 +347,147 @@ const resolveListBinding = async ({ db, binding, contextSource, currentDocument,
             return undefined;
         const populated = documentSource
             ? sourceItem
-            : (await populateRelations(await populateLinks(sourceItem)));
-        const targetContentType = getContentTypeByName(itemContentTypeName);
-        const mapped = Object.fromEntries(await Promise.all(Object.entries(binding.map).map(async ([targetField, source]) => [
-            targetField,
+            : (await populateRelations(await populateFields(sourceItem)));
+        const mappedEntries = await Promise.all(Object.entries(binding.map).map(async ([targetPath, source]) => [
+            targetPath,
             await resolveListMapSourceValue({
                 db,
                 source,
-                targetField: targetContentType?.fields[targetField],
+                targetField: target.kind === 'linkArray'
+                    ? undefined
+                    : getDynamicTargetField(target.contentType, targetPath),
                 currentSource: populated,
                 currentContentType: sourceContentType,
                 contextSource: rootDocumentSource,
             }),
-        ])));
+        ]));
+        const mapped = {};
+        mappedEntries
+            .sort(([left], [right]) => left.split('.').length - right.split('.').length)
+            .forEach(([targetPath, value]) => setAtPath(mapped, targetPath, value));
+        if (target.kind === 'linkArray')
+            return mapped;
+        const targetValue = {
+            _id: typeof sourceItem._id === 'string'
+                ? `${binding.itemName}:${sourceItem._id}`
+                : `${binding.itemName}:${index}`,
+            _type: target.contentType.name,
+            ...mapped,
+        };
+        if (target.kind === 'relationArray')
+            return targetValue;
         return {
             name: binding.itemName,
-            value: {
-                _id: typeof sourceItem._id === "string"
-                    ? `${binding.itemName}:${sourceItem._id}`
-                    : `${binding.itemName}:${index}`,
-                _type: itemContentTypeName,
-                ...mapped,
-            },
+            value: targetValue,
         };
     }));
     return resolvedItems.filter((item) => item !== undefined);
 };
-const getListTargetContentType = (field, itemName) => {
-    if (!field || (field.meta.ui !== "List" && field.meta.ui !== "Iterator")) {
+const getBlocksTargetContentType = (field, itemName) => {
+    if (!field || field.meta.capabilities.dynamic?.collection !== 'heterogeneous') {
         return undefined;
     }
-    if (!("fields" in field) || !Array.isArray(field.fields)) {
+    if (!('fields' in field) || !Array.isArray(field.fields)) {
         return undefined;
     }
     const entry = field.fields.find((item) => item.name === itemName);
     if (!entry ||
-        entry.field.meta.type !== "Relation" ||
-        !("contentType" in entry.field)) {
+        entry.field.meta.capabilities.dynamic?.relation !== true ||
+        !('contentType' in entry.field)) {
         return undefined;
     }
     return entry.field.contentType;
 };
-export const getDynamicListItemContentTypeName = (field, itemName) => getListTargetContentType(field, itemName)?.name ?? itemName;
+const getSimpleListItemField = (field) => {
+    if (!field ||
+        field.meta.capabilities.dynamic?.collection !== 'homogeneous' ||
+        !('field' in field)) {
+        return undefined;
+    }
+    return field.field;
+};
+const getDynamicListTarget = (field, itemName) => {
+    const blocksContentType = getBlocksTargetContentType(field, itemName);
+    if (blocksContentType) {
+        return { kind: 'blocks', contentType: blocksContentType };
+    }
+    const itemField = getSimpleListItemField(field);
+    if (!itemField)
+        return undefined;
+    if (itemField.meta.capabilities.dynamic?.relation === true && 'contentType' in itemField) {
+        const contentType = itemField.contentType;
+        if (itemName !== contentType.name)
+            return undefined;
+        return {
+            kind: 'relationArray',
+            contentType,
+        };
+    }
+    const itemTypeName = itemField.meta.editor ?? itemField.meta.type;
+    return itemField.meta.capabilities.dynamic?.mapProperties === true &&
+        itemField.meta.capabilities.dynamic?.properties &&
+        itemName === itemTypeName
+        ? { kind: 'linkArray' }
+        : undefined;
+};
+export const getDynamicListItemContentTypeName = (field, itemName) => {
+    const target = getDynamicListTarget(field, itemName);
+    return target && target.kind !== 'linkArray' ? target.contentType.name : itemName;
+};
 const filterListBindingMap = (contentType, fieldName, binding) => {
-    const targetContentType = getListTargetContentType(contentType.fields[fieldName], binding.itemName);
-    if (!targetContentType)
-        return binding;
-    return filterListBindingForTarget(targetContentType, binding);
+    return filterListBindingForTarget(contentType.fields[fieldName], binding);
 };
-const filterListBindingForTarget = (targetContentType, binding) => {
+const filterListBindingForTarget = (targetField, binding) => {
+    const target = getDynamicListTarget(targetField, binding.itemName);
+    if (!target)
+        return { ...binding, map: {} };
     return {
         ...binding,
-        map: Object.fromEntries(Object.entries(binding.map).flatMap(([targetField, source]) => {
-            if (!targetContentType.allowsDynamicBindingForField(targetField)) {
+        map: Object.fromEntries(Object.entries(binding.map).flatMap(([targetPath, source]) => {
+            if (target.kind === 'linkArray') {
+                return targetField &&
+                    'field' in targetField &&
+                    !!targetField.field.meta.capabilities.dynamic
+                        ?.properties?.[targetPath] &&
+                    !isNestedListSource(source)
+                    ? [[targetPath, source]]
+                    : [];
+            }
+            const field = getDynamicTargetField(target.contentType, targetPath);
+            if (!field) {
                 return [];
             }
             if (!isNestedListSource(source)) {
-                return [[targetField, source]];
+                return [[targetPath, source]];
             }
-            const nestedTargetContentType = getListTargetContentType(targetContentType.fields[targetField], source.itemName);
-            return nestedTargetContentType
-                ? [
-                    [
-                        targetField,
-                        filterListBindingForTarget(nestedTargetContentType, source),
-                    ],
-                ]
-                : [];
+            if (targetPath.includes('.'))
+                return [];
+            const nestedTarget = getDynamicListTarget(field, source.itemName);
+            return nestedTarget ? [[targetPath, filterListBindingForTarget(field, source)]] : [];
         })),
     };
 };
 const getListItemStableKey = (item) => {
     if (!isRecord(item))
         return undefined;
-    const name = typeof item.name === "string" ? item.name : "";
+    const name = typeof item.name === 'string' ? item.name : '';
     const value = item.value;
-    if (isRecord(value) && typeof value._id === "string") {
-        const id = value._id.startsWith(`${name}:`)
-            ? value._id.slice(name.length + 1)
-            : value._id;
+    if (isRecord(value) && typeof value._id === 'string') {
+        const id = value._id.startsWith(`${name}:`) ? value._id.slice(name.length + 1) : value._id;
         return `${name}:${id}`;
     }
-    if (isRecord(value) &&
-        isRecord(value.data) &&
-        typeof value.data._id === "string") {
+    if (isRecord(value) && isRecord(value.data) && typeof value.data._id === 'string') {
         return `${name}:${value.data._id}`;
     }
     return undefined;
 };
 const isListValueItem = (item) => isRecord(item) &&
-    typeof item.name === "string" &&
-    Object.prototype.hasOwnProperty.call(item, "value") &&
+    typeof item.name === 'string' &&
+    Object.prototype.hasOwnProperty.call(item, 'value') &&
     item.value !== undefined;
 export const mergeDynamicListItems = (currentValue, resolvedValue) => {
-    const currentItems = Array.isArray(currentValue)
-        ? currentValue.filter(isListValueItem)
-        : [];
-    const resolvedItems = Array.isArray(resolvedValue)
-        ? resolvedValue.filter(isListValueItem)
-        : [];
+    const currentItems = Array.isArray(currentValue) ? currentValue.filter(isListValueItem) : [];
+    const resolvedItems = Array.isArray(resolvedValue) ? resolvedValue.filter(isListValueItem) : [];
     const seen = new Set();
     const merged = [];
     for (const item of [...resolvedItems, ...currentItems]) {
@@ -454,6 +501,19 @@ export const mergeDynamicListItems = (currentValue, resolvedValue) => {
     }
     return merged;
 };
+export const mergeDynamicArrayItems = (currentValue, resolvedValue) => {
+    const currentItems = Array.isArray(currentValue) ? currentValue : [];
+    const resolvedItems = Array.isArray(resolvedValue) ? resolvedValue : [];
+    const seenIds = new Set();
+    return [...resolvedItems, ...currentItems].filter((item) => {
+        if (!isRecord(item) || typeof item._id !== 'string')
+            return true;
+        if (seenIds.has(item._id))
+            return false;
+        seenIds.add(item._id);
+        return true;
+    });
+};
 const resolveRecordBindings = async ({ db, contentType, value, contextSource, }) => {
     const bindings = getDynamicDocumentBindings(value[DYNAMIC_BINDINGS_FIELD_NAME]);
     if (!bindings)
@@ -475,13 +535,14 @@ const resolveRecordBindings = async ({ db, contentType, value, contextSource, })
             }
         }
         catch (error) {
-            Logger.error("dynamicData: field binding failed", error);
+            Logger.error('dynamicData: field binding failed', error);
         }
     }
     for (const [field, binding] of Object.entries(bindings.lists ?? {})) {
         if (!contentType.allowsDynamicBindingForField(field))
             continue;
         try {
+            const targetField = contentType.fields[field];
             const filteredBinding = filterListBindingMap(contentType, field, binding);
             const resolved = await resolveListBinding({
                 db,
@@ -489,14 +550,17 @@ const resolveRecordBindings = async ({ db, contentType, value, contextSource, })
                 contextSource,
                 currentDocument: contextSource?.value ?? next,
                 currentDocumentContentType: contextSource?.contentType ?? contentType,
-                itemContentTypeName: getDynamicListItemContentTypeName(contentType.fields[field], binding.itemName),
+                targetField,
             });
             if (resolved !== undefined) {
-                next[field] = mergeDynamicListItems(next[field], resolved);
+                next[field] =
+                    targetField.meta.capabilities.dynamic?.collection === 'homogeneous'
+                        ? mergeDynamicArrayItems(next[field], resolved)
+                        : mergeDynamicListItems(next[field], resolved);
             }
         }
         catch (error) {
-            Logger.error("dynamicData: list binding failed", error);
+            Logger.error('dynamicData: list binding failed', error);
         }
     }
     return next;
@@ -508,9 +572,7 @@ export const resolveDynamicData = async (value, options) => {
     if (!isRecord(value))
         return value;
     const contentType = options.contentType ??
-        (typeof value._type === "string"
-            ? getContentTypeByName(value._type)
-            : undefined);
+        (typeof value._type === 'string' ? getContentTypeByName(value._type) : undefined);
     const boundValue = contentType
         ? await resolveRecordBindings({
             db: options.db,