strapi-relation-names 1.0.0 → 1.2.0

package/README.md

@@ -9,6 +9,10 @@ Display Strapi relations using readable labels built from your content fields in
 ![License: MIT](https://img.shields.io/badge/license-MIT-green)
 ![npm](https://img.shields.io/npm/dt/strapi-relation-names)
 
+Ever wanted to display a relation as custom text or with nested field values? This plugin solves exactly that:
+
+![Relation labels example](assets/example.png)
+
 ---
 
 ## ✨ Features
@@ -138,13 +142,7 @@ Customer: {firstName} {lastName}
 
 ## 🗂️ How It Works
 
-The plugin changes how relations are displayed inside the Strapi Admin panel.
-
-The first placeholder in a template is used internally by Strapi's Admin relation renderer.
-
-Strapi's existing relation search and sorting continue to use the configured default main field.
-
-Missing field values are replaced with an empty string.
+At runtime, the server-side plugin decorates Strapi Content Manager relation responses and field metadata. It reads the configured template, validates each placeholder against the related content type schema, and renders the label from the returned relation data. If a value is not present, it performs a permission-aware hydration query; nested component paths are loaded by populating their component root. The rendered label is then exposed through Strapi's normal relation display mechanism. Missing field values are replaced with an empty string.
 
 For example:
 
@@ -172,9 +170,11 @@ The default label is also used when:
 
 - [ ] Live label previews while editing templates
 - [ ] Define default relation templates in plugin configuration
-- [ ] Support nested field paths in templates
+- [x] Support nested field paths in templates
+- [x] Support nested relation fields in templates
 - [ ] Import and export relation-label settings
 - [ ] Conditional labels and configurable fallback rules
+- [ ] Support label transformation functions (e.g., `toUpperCase`, `toLowerCase`, `capitalize`, etc.)
 
 If you have any feature requests or suggestions, please open a dedicated issue.
 

package/dist/admin/{SettingsPage-C1nFFJjH.js → SettingsPage-BGsuRnwx.js}

@@ -5,7 +5,7 @@ const designSystem = require("@strapi/design-system");
 const react = require("react");
 const reactIntl = require("react-intl");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-SsQXjQq0.js");
+const index = require("./index-DFr0KRky.js");
 const FIELD_TYPES = /* @__PURE__ */ new Set([
   "string",
   "text",
@@ -21,6 +21,25 @@ const FIELD_TYPES = /* @__PURE__ */ new Set([
   "time",
   "boolean"
 ]);
+const SYSTEM_SCALAR_FIELDS = [
+  "id",
+  "documentId",
+  "createdAt",
+  "updatedAt",
+  "publishedAt",
+  "locale",
+  "status"
+];
+const PLACEHOLDER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*$/;
+const getNestedSchemaUid = (attribute) => {
+  if (attribute.type === "component") {
+    return attribute.component;
+  }
+  if (attribute.type === "relation") {
+    return attribute.targetModel ?? attribute.target;
+  }
+  return void 0;
+};
 const getPlaceholders = (template) => {
   if (!template.trim()) {
     return null;
@@ -33,7 +52,7 @@ const getPlaceholders = (template) => {
       return null;
     }
     const name = match[1];
-    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) {
+    if (!PLACEHOLDER_PATTERN.test(name)) {
       return null;
     }
     placeholders.push(name);
@@ -44,16 +63,62 @@ const getPlaceholders = (template) => {
   }
   return placeholders.length > 0 ? placeholders : null;
 };
-const validateTemplate = (template, attributes) => {
+const validateTemplate = (template, attributes, schemas) => {
   const placeholders = getPlaceholders(template);
   if (!placeholders) {
     return "Use at least one valid {fieldName} placeholder.";
   }
-  const invalidField = placeholders.find(
-    (field) => !FIELD_TYPES.has(attributes?.[field]?.type ?? "")
-  );
+  const invalidField = placeholders.find((path) => {
+    const segments = path.split(".");
+    let currentAttributes = attributes;
+    for (const [index2, segment] of segments.entries()) {
+      if (index2 === 0 && segments.length === 1 && SYSTEM_SCALAR_FIELDS.includes(segment)) {
+        return false;
+      }
+      const attribute = currentAttributes?.[segment];
+      const isLastSegment = index2 === segments.length - 1;
+      if (!attribute || attribute.private === true) {
+        return true;
+      }
+      if (isLastSegment) {
+        return !FIELD_TYPES.has(attribute.type ?? "");
+      }
+      const nestedSchemaUid = getNestedSchemaUid(attribute);
+      if (!nestedSchemaUid) {
+        return true;
+      }
+      currentAttributes = schemas?.get(nestedSchemaUid)?.attributes;
+    }
+    return true;
+  });
   return invalidField ? `“${invalidField}” is not an available scalar field.` : null;
 };
+const getAvailableFields = (schema, schemas, prefix = "", ancestors = /* @__PURE__ */ new Set()) => {
+  if (!schema) {
+    return [];
+  }
+  const fields = Object.entries(schema.attributes ?? {}).flatMap(([name, attribute]) => {
+    if (attribute.private === true) {
+      return [];
+    }
+    const path = `${prefix}${name}`;
+    if (FIELD_TYPES.has(attribute.type ?? "")) {
+      return [path];
+    }
+    const nestedSchemaUid = getNestedSchemaUid(attribute);
+    if (!nestedSchemaUid || ancestors.has(nestedSchemaUid)) {
+      return [];
+    }
+    return getAvailableFields(
+      schemas.get(nestedSchemaUid),
+      schemas,
+      `${path}.`,
+      /* @__PURE__ */ new Set([...ancestors, nestedSchemaUid])
+    );
+  });
+  const systemFields = prefix === "" ? SYSTEM_SCALAR_FIELDS : [];
+  return [...systemFields, ...fields.filter((field) => !systemFields.includes(field))];
+};
 const PLUGIN_SETTINGS_PATH = "/strapi-relation-names/settings";
 const getRelationTarget = (attribute) => attribute.targetModel ?? attribute.target;
 const SettingsPage = () => {
@@ -143,7 +208,7 @@ const SettingsPage = () => {
     !isLoading ? rows.map(({ source, fieldName, target }) => {
       const targetAttributes = target?.attributes ?? {};
       const template = settings.relations[source.uid]?.[fieldName] ?? "";
-      const validationError = template ? validateTemplate(template, targetAttributes) : null;
+      const validationError = template ? validateTemplate(template, targetAttributes, schemaMap) : null;
       return /* @__PURE__ */ jsxRuntime.jsxs(
         designSystem.Box,
         {
@@ -186,7 +251,7 @@ const SettingsPage = () => {
               formatMessage({ id: index.getTranslation("settings.availableFields") }),
               ":",
               " ",
-              Object.keys(targetAttributes).join(", ")
+              getAvailableFields(target, schemaMap).join(", ")
             ] }) })
           ]
         },

package/dist/admin/{SettingsPage-BQo5mpAY.mjs → SettingsPage-Blk-4H_X.mjs}

@@ -3,7 +3,7 @@ import { Main, Box, Typography, Field, TextInput, Flex, Button } from "@strapi/d
 import { useState, useCallback, useEffect, useMemo } from "react";
 import { useIntl } from "react-intl";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { g as getTranslation } from "./index-CJO9wtUk.mjs";
+import { g as getTranslation } from "./index-DdvdGn6T.mjs";
 const FIELD_TYPES = /* @__PURE__ */ new Set([
   "string",
   "text",
@@ -19,6 +19,25 @@ const FIELD_TYPES = /* @__PURE__ */ new Set([
   "time",
   "boolean"
 ]);
+const SYSTEM_SCALAR_FIELDS = [
+  "id",
+  "documentId",
+  "createdAt",
+  "updatedAt",
+  "publishedAt",
+  "locale",
+  "status"
+];
+const PLACEHOLDER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*$/;
+const getNestedSchemaUid = (attribute) => {
+  if (attribute.type === "component") {
+    return attribute.component;
+  }
+  if (attribute.type === "relation") {
+    return attribute.targetModel ?? attribute.target;
+  }
+  return void 0;
+};
 const getPlaceholders = (template) => {
   if (!template.trim()) {
     return null;
@@ -31,7 +50,7 @@ const getPlaceholders = (template) => {
       return null;
     }
     const name = match[1];
-    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) {
+    if (!PLACEHOLDER_PATTERN.test(name)) {
       return null;
     }
     placeholders.push(name);
@@ -42,16 +61,62 @@ const getPlaceholders = (template) => {
   }
   return placeholders.length > 0 ? placeholders : null;
 };
-const validateTemplate = (template, attributes) => {
+const validateTemplate = (template, attributes, schemas) => {
   const placeholders = getPlaceholders(template);
   if (!placeholders) {
     return "Use at least one valid {fieldName} placeholder.";
   }
-  const invalidField = placeholders.find(
-    (field) => !FIELD_TYPES.has(attributes?.[field]?.type ?? "")
-  );
+  const invalidField = placeholders.find((path) => {
+    const segments = path.split(".");
+    let currentAttributes = attributes;
+    for (const [index, segment] of segments.entries()) {
+      if (index === 0 && segments.length === 1 && SYSTEM_SCALAR_FIELDS.includes(segment)) {
+        return false;
+      }
+      const attribute = currentAttributes?.[segment];
+      const isLastSegment = index === segments.length - 1;
+      if (!attribute || attribute.private === true) {
+        return true;
+      }
+      if (isLastSegment) {
+        return !FIELD_TYPES.has(attribute.type ?? "");
+      }
+      const nestedSchemaUid = getNestedSchemaUid(attribute);
+      if (!nestedSchemaUid) {
+        return true;
+      }
+      currentAttributes = schemas?.get(nestedSchemaUid)?.attributes;
+    }
+    return true;
+  });
   return invalidField ? `“${invalidField}” is not an available scalar field.` : null;
 };
+const getAvailableFields = (schema, schemas, prefix = "", ancestors = /* @__PURE__ */ new Set()) => {
+  if (!schema) {
+    return [];
+  }
+  const fields = Object.entries(schema.attributes ?? {}).flatMap(([name, attribute]) => {
+    if (attribute.private === true) {
+      return [];
+    }
+    const path = `${prefix}${name}`;
+    if (FIELD_TYPES.has(attribute.type ?? "")) {
+      return [path];
+    }
+    const nestedSchemaUid = getNestedSchemaUid(attribute);
+    if (!nestedSchemaUid || ancestors.has(nestedSchemaUid)) {
+      return [];
+    }
+    return getAvailableFields(
+      schemas.get(nestedSchemaUid),
+      schemas,
+      `${path}.`,
+      /* @__PURE__ */ new Set([...ancestors, nestedSchemaUid])
+    );
+  });
+  const systemFields = prefix === "" ? SYSTEM_SCALAR_FIELDS : [];
+  return [...systemFields, ...fields.filter((field) => !systemFields.includes(field))];
+};
 const PLUGIN_SETTINGS_PATH = "/strapi-relation-names/settings";
 const getRelationTarget = (attribute) => attribute.targetModel ?? attribute.target;
 const SettingsPage = () => {
@@ -141,7 +206,7 @@ const SettingsPage = () => {
     !isLoading ? rows.map(({ source, fieldName, target }) => {
       const targetAttributes = target?.attributes ?? {};
       const template = settings.relations[source.uid]?.[fieldName] ?? "";
-      const validationError = template ? validateTemplate(template, targetAttributes) : null;
+      const validationError = template ? validateTemplate(template, targetAttributes, schemaMap) : null;
       return /* @__PURE__ */ jsxs(
         Box,
         {
@@ -184,7 +249,7 @@ const SettingsPage = () => {
               formatMessage({ id: getTranslation("settings.availableFields") }),
               ":",
               " ",
-              Object.keys(targetAttributes).join(", ")
+              getAvailableFields(target, schemaMap).join(", ")
             ] }) })
           ]
         },

package/dist/admin/{index-SsQXjQq0.js → index-DFr0KRky.js}

@@ -89,7 +89,7 @@ const plugin = {
         id: `${PLUGIN_ID}.plugin.name`,
         defaultMessage: "Relation Names"
       },
-      Component: () => Promise.resolve().then(() => require("./SettingsPage-C1nFFJjH.js")).then((module2) => ({ default: module2.SettingsPage })),
+      Component: () => Promise.resolve().then(() => require("./SettingsPage-BGsuRnwx.js")).then((module2) => ({ default: module2.SettingsPage })),
       permissions: []
     });
     app.registerPlugin({

package/dist/admin/{index-CJO9wtUk.mjs → index-DdvdGn6T.mjs}

@@ -88,7 +88,7 @@ const plugin = {
         id: `${PLUGIN_ID}.plugin.name`,
         defaultMessage: "Relation Names"
       },
-      Component: () => import("./SettingsPage-BQo5mpAY.mjs").then((module) => ({ default: module.SettingsPage })),
+      Component: () => import("./SettingsPage-Blk-4H_X.mjs").then((module) => ({ default: module.SettingsPage })),
       permissions: []
     });
     app.registerPlugin({

package/dist/admin/index.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const index = require("./index-SsQXjQq0.js");
+const index = require("./index-DFr0KRky.js");
 exports.default = index.plugin;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { p } from "./index-CJO9wtUk.mjs";
+import { p } from "./index-DdvdGn6T.mjs";
 export {
   p as default
 };

package/dist/admin/src/types.d.ts

@@ -6,6 +6,8 @@ export type SchemaAttribute = {
     type?: string;
     targetModel?: string;
     target?: string;
+    component?: string;
+    private?: boolean;
     relationType?: string;
 };
 export type Schema = {

package/dist/admin/src/utils/template.d.ts

@@ -1,5 +1,14 @@
-declare const getPlaceholders: (template: string) => string[] | null;
-declare const validateTemplate: (template: string, attributes: Record<string, {
+type TemplateAttribute = {
     type?: string;
-}> | undefined) => string | null;
-export { getPlaceholders, validateTemplate };
+    component?: string;
+    target?: string;
+    targetModel?: string;
+    private?: boolean;
+};
+type TemplateSchema = {
+    attributes?: Record<string, TemplateAttribute>;
+};
+declare const getPlaceholders: (template: string) => string[] | null;
+declare const validateTemplate: (template: string, attributes: Record<string, TemplateAttribute> | undefined, schemas?: ReadonlyMap<string, TemplateSchema>) => string | null;
+declare const getAvailableFields: (schema: TemplateSchema | undefined, schemas: ReadonlyMap<string, TemplateSchema>, prefix?: string, ancestors?: Set<string>) => string[];
+export { getAvailableFields, getPlaceholders, validateTemplate };

package/dist/server/index.js

@@ -151,7 +151,25 @@ const SCALAR_TYPES = /* @__PURE__ */ new Set([
   "time",
   "boolean"
 ]);
+const SYSTEM_SCALAR_FIELDS = /* @__PURE__ */ new Set([
+  "id",
+  "documentId",
+  "createdAt",
+  "updatedAt",
+  "publishedAt",
+  "locale",
+  "status"
+]);
+const PLACEHOLDER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*$/;
 const isRecord$1 = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
+const getPathValue = (value, path) => {
+  return path.split(".").reduce((current, segment) => {
+    if (Array.isArray(current)) {
+      return current.map((item) => isRecord$1(item) ? item[segment] : void 0).filter((item) => item !== void 0);
+    }
+    return isRecord$1(current) ? current[segment] : void 0;
+  }, value);
+};
 const parseTemplate = (template) => {
   if (!template.trim()) {
     return null;
@@ -172,7 +190,7 @@ const parseTemplate = (template) => {
       return null;
     }
     const name = template.slice(openingBrace + 1, end);
-    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) {
+    if (!PLACEHOLDER_PATTERN.test(name)) {
       return null;
     }
     placeholders.push(name);
@@ -180,17 +198,36 @@ const parseTemplate = (template) => {
   }
   return placeholders.length > 0 ? placeholders : null;
 };
-const compileTemplate = (template, targetSchema) => {
+const compileTemplate = (template, targetSchema, resolveSchema) => {
   const placeholders = parseTemplate(template);
-  const attributes = targetSchema?.attributes ?? {};
   if (!placeholders || !targetSchema) {
     return null;
   }
-  const valid = placeholders.every((name) => {
-    const attribute = attributes[name];
-    return Boolean(
-      attribute && attribute.private !== true && SCALAR_TYPES.has(attribute.type ?? "")
-    );
+  const valid = placeholders.every((path) => {
+    const segments = path.split(".");
+    let schema = targetSchema;
+    for (const [index2, segment] of segments.entries()) {
+      const attribute = schema.attributes?.[segment];
+      const isLastSegment = index2 === segments.length - 1;
+      if (index2 === 0 && isLastSegment && SYSTEM_SCALAR_FIELDS.has(segment)) {
+        return true;
+      }
+      if (!attribute || attribute.private === true) {
+        return false;
+      }
+      if (isLastSegment) {
+        return SCALAR_TYPES.has(attribute.type ?? "");
+      }
+      const nestedSchemaUid = attribute.type === "component" ? attribute.component : attribute.type === "relation" ? attribute.target : void 0;
+      if (!nestedSchemaUid || !resolveSchema) {
+        return false;
+      }
+      schema = resolveSchema(nestedSchemaUid);
+      if (!schema) {
+        return false;
+      }
+    }
+    return false;
   });
   if (!valid) {
     return null;
@@ -198,14 +235,14 @@ const compileTemplate = (template, targetSchema) => {
   return {
     template,
     placeholders,
-    displayField: placeholders[0]
+    displayField: placeholders[0].split(".").slice(-1)[0] ?? placeholders[0]
   };
 };
 const renderTemplate = (compiled, values) => {
   const rendered = compiled.template.replace(
-    /\{([A-Za-z_][A-Za-z0-9_]*)\}/g,
+    /\{([A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*)\}/g,
     (_match, name) => {
-      const value = values[name];
+      const value = getPathValue(values, name);
       return value === null || value === void 0 ? "" : String(value);
     }
   );
@@ -272,28 +309,62 @@ const getRuntime = async (strapi, settings2, sourceUid, targetField, userAbility
   }
   const template = settings2.relations[sourceUid]?.[targetField];
   const targetSchema = strapi.getModel(attribute.target);
-  const compiled = typeof template === "string" ? compileTemplate(template, targetSchema) : null;
+  const compiled = typeof template === "string" ? compileTemplate(
+    template,
+    targetSchema,
+    (uid) => strapi.getModel(uid)
+  ) : null;
   if (!compiled || !targetSchema) {
     return null;
   }
+  const originalMainField = await getOriginalMainField(
+    strapi,
+    sourceSchema,
+    targetSchema,
+    targetField,
+    userAbility
+  );
   return {
     ...compiled,
+    displayField: compiled.placeholders.some((placeholder) => placeholder.includes(".")) ? originalMainField : compiled.displayField,
     sourceUid,
     targetUid: targetSchema.uid,
-    originalMainField: await getOriginalMainField(
-      strapi,
-      sourceSchema,
-      targetSchema,
-      targetField,
-      userAbility
-    )
+    originalMainField
   };
 };
+const buildPopulate = (placeholders) => {
+  const populate = {};
+  for (const placeholder of placeholders) {
+    const segments = placeholder.split(".");
+    if (segments.length < 2) {
+      continue;
+    }
+    let current = populate;
+    for (const [index2, segment] of segments.slice(0, -1).entries()) {
+      const existing = current[segment];
+      if (existing === true) {
+        break;
+      }
+      if (index2 === segments.length - 2) {
+        current[segment] = existing ?? true;
+        break;
+      }
+      if (!existing) {
+        current[segment] = { populate: {} };
+      }
+      const next = current[segment];
+      if (next !== true) {
+        current = next.populate;
+      }
+    }
+  }
+  return Object.keys(populate).length > 0 ? populate : void 0;
+};
 const hydrateValues = async (strapi, ctx, runtime, values) => {
   const targetSchema = strapi.getModel(runtime.targetUid);
   const targetModelType = targetSchema.modelType;
   const missingFields = runtime.placeholders.filter(
-    (field) => values.some((value) => !Object.prototype.hasOwnProperty.call(value, field))
+    (field) => values.some((value) => getPathValue(value, field) === void 0)
   );
   if (missingFields.length === 0) {
     return new Map(values.map((value) => [value, value]));
@@ -306,7 +377,7 @@ const hydrateValues = async (strapi, ctx, runtime, values) => {
     const permissionChecker = strapi.plugin("content-manager").service("permission-checker").create({ userAbility: ctx.state.userAbility, model: runtime.targetUid });
     const fields = Array.from(
       /* @__PURE__ */ new Set([
-        ...runtime.placeholders,
+        ...runtime.placeholders.filter((field) => !field.includes(".")),
         runtime.originalMainField,
         "id",
         "documentId",
@@ -314,10 +385,12 @@ const hydrateValues = async (strapi, ctx, runtime, values) => {
         "publishedAt"
       ])
     );
+    const populate = buildPopulate(runtime.placeholders);
     const identityField = targetModelType === "component" ? "id" : "documentId";
     const permissionQuery = await permissionChecker.sanitizedQuery.read({
       fields,
-      filters: { [identityField]: { $in: identities } }
+      filters: { [identityField]: { $in: identities } },
+      ...populate ? { populate } : {}
     });
     const query = strapi.get("query-params").transform(runtime.targetUid, permissionQuery);
     const hydrated = await strapi.db.query(runtime.targetUid).findMany(query);
@@ -370,23 +443,27 @@ const relationLabels = ({ strapi }) => {
       const targetSchema = strapi.getModel(attribute.target);
       const compiled = compileTemplate(
         settings2.relations[sourceUid]?.[fieldName] ?? "",
-        targetSchema
+        targetSchema,
+        (uid) => strapi.getModel(uid)
       );
       if (!compiled || !isRecord$1(metadata)) {
         continue;
       }
+      const editMetadata = isRecord$1(metadata.edit) ? metadata.edit : {};
+      const configuredMainField = typeof editMetadata.mainField === "string" ? editMetadata.mainField : "id";
+      const displayField = compiled.placeholders.some((placeholder) => placeholder.includes(".")) ? configuredMainField : compiled.displayField;
       metadatas[fieldName] = {
         ...metadata,
         edit: {
-          ...isRecord$1(metadata.edit) ? metadata.edit : {},
-          mainField: compiled.displayField
+          ...editMetadata,
+          mainField: displayField
         },
         list: {
           ...isRecord$1(metadata.list) ? metadata.list : {},
-          mainField: compiled.displayField
+          mainField: displayField
         }
       };
-      relationNames[fieldName] = { mainField: compiled.displayField };
+      relationNames[fieldName] = { mainField: displayField };
     }
     return {
       ...configuration,

package/dist/server/index.mjs

@@ -149,7 +149,25 @@ const SCALAR_TYPES = /* @__PURE__ */ new Set([
   "time",
   "boolean"
 ]);
+const SYSTEM_SCALAR_FIELDS = /* @__PURE__ */ new Set([
+  "id",
+  "documentId",
+  "createdAt",
+  "updatedAt",
+  "publishedAt",
+  "locale",
+  "status"
+]);
+const PLACEHOLDER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*$/;
 const isRecord$1 = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
+const getPathValue = (value, path) => {
+  return path.split(".").reduce((current, segment) => {
+    if (Array.isArray(current)) {
+      return current.map((item) => isRecord$1(item) ? item[segment] : void 0).filter((item) => item !== void 0);
+    }
+    return isRecord$1(current) ? current[segment] : void 0;
+  }, value);
+};
 const parseTemplate = (template) => {
   if (!template.trim()) {
     return null;
@@ -170,7 +188,7 @@ const parseTemplate = (template) => {
       return null;
     }
     const name = template.slice(openingBrace + 1, end);
-    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) {
+    if (!PLACEHOLDER_PATTERN.test(name)) {
       return null;
     }
     placeholders.push(name);
@@ -178,17 +196,36 @@ const parseTemplate = (template) => {
   }
   return placeholders.length > 0 ? placeholders : null;
 };
-const compileTemplate = (template, targetSchema) => {
+const compileTemplate = (template, targetSchema, resolveSchema) => {
   const placeholders = parseTemplate(template);
-  const attributes = targetSchema?.attributes ?? {};
   if (!placeholders || !targetSchema) {
     return null;
   }
-  const valid = placeholders.every((name) => {
-    const attribute = attributes[name];
-    return Boolean(
-      attribute && attribute.private !== true && SCALAR_TYPES.has(attribute.type ?? "")
-    );
+  const valid = placeholders.every((path) => {
+    const segments = path.split(".");
+    let schema = targetSchema;
+    for (const [index2, segment] of segments.entries()) {
+      const attribute = schema.attributes?.[segment];
+      const isLastSegment = index2 === segments.length - 1;
+      if (index2 === 0 && isLastSegment && SYSTEM_SCALAR_FIELDS.has(segment)) {
+        return true;
+      }
+      if (!attribute || attribute.private === true) {
+        return false;
+      }
+      if (isLastSegment) {
+        return SCALAR_TYPES.has(attribute.type ?? "");
+      }
+      const nestedSchemaUid = attribute.type === "component" ? attribute.component : attribute.type === "relation" ? attribute.target : void 0;
+      if (!nestedSchemaUid || !resolveSchema) {
+        return false;
+      }
+      schema = resolveSchema(nestedSchemaUid);
+      if (!schema) {
+        return false;
+      }
+    }
+    return false;
   });
   if (!valid) {
     return null;
@@ -196,14 +233,14 @@ const compileTemplate = (template, targetSchema) => {
   return {
     template,
     placeholders,
-    displayField: placeholders[0]
+    displayField: placeholders[0].split(".").slice(-1)[0] ?? placeholders[0]
   };
 };
 const renderTemplate = (compiled, values) => {
   const rendered = compiled.template.replace(
-    /\{([A-Za-z_][A-Za-z0-9_]*)\}/g,
+    /\{([A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*)\}/g,
     (_match, name) => {
-      const value = values[name];
+      const value = getPathValue(values, name);
       return value === null || value === void 0 ? "" : String(value);
     }
   );
@@ -270,28 +307,62 @@ const getRuntime = async (strapi, settings2, sourceUid, targetField, userAbility
   }
   const template = settings2.relations[sourceUid]?.[targetField];
   const targetSchema = strapi.getModel(attribute.target);
-  const compiled = typeof template === "string" ? compileTemplate(template, targetSchema) : null;
+  const compiled = typeof template === "string" ? compileTemplate(
+    template,
+    targetSchema,
+    (uid) => strapi.getModel(uid)
+  ) : null;
   if (!compiled || !targetSchema) {
     return null;
   }
+  const originalMainField = await getOriginalMainField(
+    strapi,
+    sourceSchema,
+    targetSchema,
+    targetField,
+    userAbility
+  );
   return {
     ...compiled,
+    displayField: compiled.placeholders.some((placeholder) => placeholder.includes(".")) ? originalMainField : compiled.displayField,
     sourceUid,
     targetUid: targetSchema.uid,
-    originalMainField: await getOriginalMainField(
-      strapi,
-      sourceSchema,
-      targetSchema,
-      targetField,
-      userAbility
-    )
+    originalMainField
   };
 };
+const buildPopulate = (placeholders) => {
+  const populate = {};
+  for (const placeholder of placeholders) {
+    const segments = placeholder.split(".");
+    if (segments.length < 2) {
+      continue;
+    }
+    let current = populate;
+    for (const [index2, segment] of segments.slice(0, -1).entries()) {
+      const existing = current[segment];
+      if (existing === true) {
+        break;
+      }
+      if (index2 === segments.length - 2) {
+        current[segment] = existing ?? true;
+        break;
+      }
+      if (!existing) {
+        current[segment] = { populate: {} };
+      }
+      const next = current[segment];
+      if (next !== true) {
+        current = next.populate;
+      }
+    }
+  }
+  return Object.keys(populate).length > 0 ? populate : void 0;
+};
 const hydrateValues = async (strapi, ctx, runtime, values) => {
   const targetSchema = strapi.getModel(runtime.targetUid);
   const targetModelType = targetSchema.modelType;
   const missingFields = runtime.placeholders.filter(
-    (field) => values.some((value) => !Object.prototype.hasOwnProperty.call(value, field))
+    (field) => values.some((value) => getPathValue(value, field) === void 0)
   );
   if (missingFields.length === 0) {
     return new Map(values.map((value) => [value, value]));
@@ -304,7 +375,7 @@ const hydrateValues = async (strapi, ctx, runtime, values) => {
     const permissionChecker = strapi.plugin("content-manager").service("permission-checker").create({ userAbility: ctx.state.userAbility, model: runtime.targetUid });
     const fields = Array.from(
       /* @__PURE__ */ new Set([
-        ...runtime.placeholders,
+        ...runtime.placeholders.filter((field) => !field.includes(".")),
         runtime.originalMainField,
         "id",
         "documentId",
@@ -312,10 +383,12 @@ const hydrateValues = async (strapi, ctx, runtime, values) => {
         "publishedAt"
       ])
     );
+    const populate = buildPopulate(runtime.placeholders);
     const identityField = targetModelType === "component" ? "id" : "documentId";
     const permissionQuery = await permissionChecker.sanitizedQuery.read({
       fields,
-      filters: { [identityField]: { $in: identities } }
+      filters: { [identityField]: { $in: identities } },
+      ...populate ? { populate } : {}
     });
     const query = strapi.get("query-params").transform(runtime.targetUid, permissionQuery);
     const hydrated = await strapi.db.query(runtime.targetUid).findMany(query);
@@ -368,23 +441,27 @@ const relationLabels = ({ strapi }) => {
       const targetSchema = strapi.getModel(attribute.target);
       const compiled = compileTemplate(
         settings2.relations[sourceUid]?.[fieldName] ?? "",
-        targetSchema
+        targetSchema,
+        (uid) => strapi.getModel(uid)
       );
       if (!compiled || !isRecord$1(metadata)) {
         continue;
       }
+      const editMetadata = isRecord$1(metadata.edit) ? metadata.edit : {};
+      const configuredMainField = typeof editMetadata.mainField === "string" ? editMetadata.mainField : "id";
+      const displayField = compiled.placeholders.some((placeholder) => placeholder.includes(".")) ? configuredMainField : compiled.displayField;
       metadatas[fieldName] = {
         ...metadata,
         edit: {
-          ...isRecord$1(metadata.edit) ? metadata.edit : {},
-          mainField: compiled.displayField
+          ...editMetadata,
+          mainField: displayField
         },
         list: {
           ...isRecord$1(metadata.list) ? metadata.list : {},
-          mainField: compiled.displayField
+          mainField: displayField
         }
       };
-      relationNames[fieldName] = { mainField: compiled.displayField };
+      relationNames[fieldName] = { mainField: displayField };
     }
     return {
       ...configuration,

package/dist/server/src/index.d.ts

@@ -48,7 +48,7 @@ declare const _default: {
             decorateCollectionResults: (ctx: any, sourceUid: string, results: unknown[]) => Promise<unknown[]>;
             decorateConfiguration: (data: any, sourceUid: string) => Promise<any>;
             decorateRelationResults: (ctx: any, sourceUid: string, targetField: string, results: unknown[]) => Promise<unknown[]>;
-            compileTemplate: (template: string, targetSchema: import('./services/utils/relation-labels').SchemaLike | undefined) => import('./services/utils/relation-labels').CompiledTemplate | null;
+            compileTemplate: (template: string, targetSchema: import('./services/utils/relation-labels').SchemaLike | undefined, resolveSchema?: import('./services/utils/relation-labels').SchemaResolver) => import('./services/utils/relation-labels').CompiledTemplate | null;
             parseTemplate: (template: string) => string[] | null;
             renderTemplate: (compiled: import('./services/utils/relation-labels').CompiledTemplate, values: Record<string, unknown>) => string;
         };

package/dist/server/src/services/index.d.ts

@@ -5,7 +5,7 @@ declare const _default: {
         decorateCollectionResults: (ctx: any, sourceUid: string, results: unknown[]) => Promise<unknown[]>;
         decorateConfiguration: (data: any, sourceUid: string) => Promise<any>;
         decorateRelationResults: (ctx: any, sourceUid: string, targetField: string, results: unknown[]) => Promise<unknown[]>;
-        compileTemplate: (template: string, targetSchema: import('./utils/relation-labels').SchemaLike | undefined) => import('./utils/relation-labels').CompiledTemplate | null;
+        compileTemplate: (template: string, targetSchema: import('./utils/relation-labels').SchemaLike | undefined, resolveSchema?: import('./utils/relation-labels').SchemaResolver) => import('./utils/relation-labels').CompiledTemplate | null;
         parseTemplate: (template: string) => string[] | null;
         renderTemplate: (compiled: import('./utils/relation-labels').CompiledTemplate, values: Record<string, unknown>) => string;
     };

package/dist/server/src/services/relation-labels.d.ts

@@ -1,14 +1,19 @@
 import { Core } from '@strapi/strapi';
 import { SchemaLike } from './utils/relation-labels';
+type Populate = Record<string, true | {
+    populate: Populate;
+}>;
+declare const buildPopulate: (placeholders: string[]) => Populate | undefined;
 declare const relationLabels: ({ strapi }: {
     strapi: Core.Strapi;
 }) => {
     decorateCollectionResults: (ctx: any, sourceUid: string, results: unknown[]) => Promise<unknown[]>;
     decorateConfiguration: (data: any, sourceUid: string) => Promise<any>;
     decorateRelationResults: (ctx: any, sourceUid: string, targetField: string, results: unknown[]) => Promise<unknown[]>;
-    compileTemplate: (template: string, targetSchema: SchemaLike | undefined) => import('./utils/relation-labels').CompiledTemplate | null;
+    compileTemplate: (template: string, targetSchema: SchemaLike | undefined, resolveSchema?: import('./utils/relation-labels').SchemaResolver) => import('./utils/relation-labels').CompiledTemplate | null;
     parseTemplate: (template: string) => string[] | null;
     renderTemplate: (compiled: import('./utils/relation-labels').CompiledTemplate, values: Record<string, unknown>) => string;
 };
+export { buildPopulate };
 export { compileTemplate, parseTemplate, renderTemplate } from './utils/relation-labels';
 export default relationLabels;

package/dist/server/src/services/utils/relation-labels.d.ts

@@ -11,6 +11,7 @@ export type SchemaLike = {
     modelType?: string;
     attributes?: Record<string, SchemaAttribute>;
 };
+export type SchemaResolver = (uid: string) => SchemaLike | undefined;
 export type CompiledTemplate = {
     template: string;
     placeholders: string[];
@@ -22,6 +23,7 @@ export type RelationRuntime = CompiledTemplate & {
     originalMainField: string;
 };
 export declare const isRecord: (value: unknown) => value is Record<string, unknown>;
+export declare const getPathValue: (value: unknown, path: string) => unknown;
 export declare const parseTemplate: (template: string) => string[] | null;
-export declare const compileTemplate: (template: string, targetSchema: SchemaLike | undefined) => CompiledTemplate | null;
+export declare const compileTemplate: (template: string, targetSchema: SchemaLike | undefined, resolveSchema?: SchemaResolver) => CompiledTemplate | null;
 export declare const renderTemplate: (compiled: CompiledTemplate, values: Record<string, unknown>) => string;

package/package.json

@@ -5,7 +5,7 @@
   "author": "Christoph Tupi <christoph.tupi@gmail.com>",
   "keywords": [],
   "type": "commonjs",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "strapi": {
     "kind": "plugin",
     "name": "strapi-relation-names",