strapi-relation-names 1.1.0 → 1.2.1

package/README.md

@@ -171,6 +171,7 @@ The default label is also used when:
 - [ ] Live label previews while editing templates
 - [ ] Define default relation templates in plugin configuration
 - [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.)

package/dist/admin/{SettingsPage-CaBXOirN.js → SettingsPage-BebR4ghK.js}

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const designSystem = require("@strapi/design-system");
+const styled = require("styled-components");
 const react = require("react");
 const reactIntl = require("react-intl");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-CKaZcnCM.js");
+const index = require("./index-DfSAe961.js");
+const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
+const styled__default = /* @__PURE__ */ _interopDefault(styled);
 const FIELD_TYPES = /* @__PURE__ */ new Set([
   "string",
   "text",
@@ -31,6 +34,15 @@ const SYSTEM_SCALAR_FIELDS = [
   "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;
@@ -74,10 +86,11 @@ const validateTemplate = (template, attributes, schemas) => {
       if (isLastSegment) {
         return !FIELD_TYPES.has(attribute.type ?? "");
       }
-      if (attribute.type !== "component" || !attribute.component) {
+      const nestedSchemaUid = getNestedSchemaUid(attribute);
+      if (!nestedSchemaUid) {
         return true;
       }
-      currentAttributes = schemas?.get(attribute.component)?.attributes;
+      currentAttributes = schemas?.get(nestedSchemaUid)?.attributes;
     }
     return true;
   });
@@ -95,20 +108,36 @@ const getAvailableFields = (schema, schemas, prefix = "", ancestors = /* @__PURE
     if (FIELD_TYPES.has(attribute.type ?? "")) {
       return [path];
     }
-    if (attribute.type !== "component" || !attribute.component || ancestors.has(attribute.component)) {
+    const nestedSchemaUid = getNestedSchemaUid(attribute);
+    if (!nestedSchemaUid || ancestors.has(nestedSchemaUid)) {
       return [];
     }
     return getAvailableFields(
-      schemas.get(attribute.component),
+      schemas.get(nestedSchemaUid),
       schemas,
       `${path}.`,
-      /* @__PURE__ */ new Set([...ancestors, attribute.component])
+      /* @__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 AvailableField = styled__default.default(designSystem.Typography)`
+  display: inline-block;
+  padding: 1px 4px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  background: transparent;
+  color: inherit;
+  cursor: pointer;
+  font: inherit;
+
+  &:hover,
+  &[aria-pressed='true'] {
+    border-color: currentColor;
+  }
+`;
 const getRelationTarget = (attribute) => attribute.targetModel ?? attribute.target;
 const SettingsPage = () => {
   const { formatMessage } = reactIntl.useIntl();
@@ -190,7 +219,24 @@ const SettingsPage = () => {
   };
   return /* @__PURE__ */ jsxRuntime.jsx(designSystem.Main, { "aria-labelledby": "relation-names-title", children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Box, { padding: 8, children: [
     /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "alpha", tag: "h1", id: "relation-names-title", children: formatMessage({ id: index.getTranslation("settings.title") }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { paddingTop: 2, paddingBottom: 6, children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { textColor: "neutral600", children: formatMessage({ id: index.getTranslation("settings.description") }) }) }),
+    /* @__PURE__ */ jsxRuntime.jsxs(
+      designSystem.Flex,
+      {
+        gap: 2,
+        width: "100%",
+        paddingBottom: 6,
+        style: {
+          "justify-content": "space-between",
+          position: "sticky",
+          top: ".5rem",
+          zIndex: 1
+        },
+        children: [
+          /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { textColor: "neutral600", children: formatMessage({ id: index.getTranslation("settings.description") }) }),
+          !isLoading && rows.length > 0 ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { loading: isSaving, disabled: isSaving, onClick: () => void save(), children: formatMessage({ id: index.getTranslation("settings.save") }) }) : null
+        ]
+      }
+    ),
     isLoading ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { children: formatMessage({ id: index.getTranslation("settings.loading") }) }) : null,
     error ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { textColor: "danger600", tag: "p", children: error }) : null,
     !isLoading && rows.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { children: formatMessage({ id: index.getTranslation("settings.noRelations") }) }) : null,
@@ -198,6 +244,12 @@ const SettingsPage = () => {
       const targetAttributes = target?.attributes ?? {};
       const template = settings.relations[source.uid]?.[fieldName] ?? "";
       const validationError = template ? validateTemplate(template, targetAttributes, schemaMap) : null;
+      const availableFields = getAvailableFields(target, schemaMap);
+      const toggleField = (field) => {
+        const placeholder = `{${field}}`;
+        const nextTemplate = template.includes(placeholder) ? template.replaceAll(placeholder, "").replace(/\s{2,}/g, " ").trim() : `${template.trim()}${template.trim() ? " " : ""}${placeholder}`;
+        updateTemplate(source.uid, fieldName, nextTemplate);
+      };
       return /* @__PURE__ */ jsxRuntime.jsxs(
         designSystem.Box,
         {
@@ -222,7 +274,9 @@ const SettingsPage = () => {
                 error: validationError ?? void 0,
                 name: `${source.uid}.${fieldName}`,
                 children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Label, { children: formatMessage({ id: index.getTranslation("settings.template") }) }),
+                  /* @__PURE__ */ jsxRuntime.jsx(designSystem.Field.Label, { children: formatMessage({
+                    id: index.getTranslation("settings.template")
+                  }) }),
                   /* @__PURE__ */ jsxRuntime.jsx(
                     designSystem.TextInput,
                     {
@@ -236,18 +290,34 @@ const SettingsPage = () => {
                 ]
               }
             ),
-            /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { paddingTop: 2, children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: [
-              formatMessage({ id: index.getTranslation("settings.availableFields") }),
-              ":",
-              " ",
-              getAvailableFields(target, schemaMap).join(", ")
-            ] }) })
+            /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { paddingTop: 2, children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Accordion.Root, { collapsible: true, children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Accordion.Item, { value: "available-fields", children: [
+              /* @__PURE__ */ jsxRuntime.jsx(designSystem.Accordion.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Accordion.Trigger, { children: formatMessage({
+                id: index.getTranslation("settings.availableFields")
+              }) }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(designSystem.Accordion.Content, { children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: availableFields.map((field, index2) => {
+                const placeholder = `{${field}}`;
+                return /* @__PURE__ */ jsxRuntime.jsxs(react.Fragment, { children: [
+                  index2 > 0 ? ", " : null,
+                  /* @__PURE__ */ jsxRuntime.jsx(
+                    AvailableField,
+                    {
+                      as: "button",
+                      type: "button",
+                      variant: "pi",
+                      textColor: "neutral600",
+                      "aria-pressed": template.includes(placeholder),
+                      onClick: () => toggleField(field),
+                      children: field
+                    }
+                  )
+                ] }, field);
+              }) }) })
+            ] }) }) })
           ]
         },
         `${source.uid}.${fieldName}`
       );
-    }) : null,
-    !isLoading && rows.length > 0 ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Flex, { justifyContent: "flex-end", paddingTop: 4, children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { loading: isSaving, disabled: isSaving, onClick: () => void save(), children: formatMessage({ id: index.getTranslation("settings.save") }) }) }) : null
+    }) : null
   ] }) });
 };
 exports.SettingsPage = SettingsPage;

package/dist/admin/{SettingsPage-CpTyZSvB.mjs → SettingsPage-DFZP5CZs.mjs}

@@ -1,9 +1,10 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { Main, Box, Typography, Field, TextInput, Flex, Button } from "@strapi/design-system";
-import { useState, useCallback, useEffect, useMemo } from "react";
+import { Main, Box, Typography, Flex, Button, Field, TextInput, Accordion } from "@strapi/design-system";
+import styled from "styled-components";
+import { useState, useCallback, useEffect, useMemo, Fragment } from "react";
 import { useIntl } from "react-intl";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { g as getTranslation } from "./index-DGXo1dxk.mjs";
+import { g as getTranslation } from "./index-CiS6cuI9.mjs";
 const FIELD_TYPES = /* @__PURE__ */ new Set([
   "string",
   "text",
@@ -29,6 +30,15 @@ const SYSTEM_SCALAR_FIELDS = [
   "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;
@@ -72,10 +82,11 @@ const validateTemplate = (template, attributes, schemas) => {
       if (isLastSegment) {
         return !FIELD_TYPES.has(attribute.type ?? "");
       }
-      if (attribute.type !== "component" || !attribute.component) {
+      const nestedSchemaUid = getNestedSchemaUid(attribute);
+      if (!nestedSchemaUid) {
         return true;
       }
-      currentAttributes = schemas?.get(attribute.component)?.attributes;
+      currentAttributes = schemas?.get(nestedSchemaUid)?.attributes;
     }
     return true;
   });
@@ -93,20 +104,36 @@ const getAvailableFields = (schema, schemas, prefix = "", ancestors = /* @__PURE
     if (FIELD_TYPES.has(attribute.type ?? "")) {
       return [path];
     }
-    if (attribute.type !== "component" || !attribute.component || ancestors.has(attribute.component)) {
+    const nestedSchemaUid = getNestedSchemaUid(attribute);
+    if (!nestedSchemaUid || ancestors.has(nestedSchemaUid)) {
       return [];
     }
     return getAvailableFields(
-      schemas.get(attribute.component),
+      schemas.get(nestedSchemaUid),
       schemas,
       `${path}.`,
-      /* @__PURE__ */ new Set([...ancestors, attribute.component])
+      /* @__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 AvailableField = styled(Typography)`
+  display: inline-block;
+  padding: 1px 4px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  background: transparent;
+  color: inherit;
+  cursor: pointer;
+  font: inherit;
+
+  &:hover,
+  &[aria-pressed='true'] {
+    border-color: currentColor;
+  }
+`;
 const getRelationTarget = (attribute) => attribute.targetModel ?? attribute.target;
 const SettingsPage = () => {
   const { formatMessage } = useIntl();
@@ -188,7 +215,24 @@ const SettingsPage = () => {
   };
   return /* @__PURE__ */ jsx(Main, { "aria-labelledby": "relation-names-title", children: /* @__PURE__ */ jsxs(Box, { padding: 8, children: [
     /* @__PURE__ */ jsx(Typography, { variant: "alpha", tag: "h1", id: "relation-names-title", children: formatMessage({ id: getTranslation("settings.title") }) }),
-    /* @__PURE__ */ jsx(Box, { paddingTop: 2, paddingBottom: 6, children: /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", children: formatMessage({ id: getTranslation("settings.description") }) }) }),
+    /* @__PURE__ */ jsxs(
+      Flex,
+      {
+        gap: 2,
+        width: "100%",
+        paddingBottom: 6,
+        style: {
+          "justify-content": "space-between",
+          position: "sticky",
+          top: ".5rem",
+          zIndex: 1
+        },
+        children: [
+          /* @__PURE__ */ jsx(Typography, { textColor: "neutral600", children: formatMessage({ id: getTranslation("settings.description") }) }),
+          !isLoading && rows.length > 0 ? /* @__PURE__ */ jsx(Button, { loading: isSaving, disabled: isSaving, onClick: () => void save(), children: formatMessage({ id: getTranslation("settings.save") }) }) : null
+        ]
+      }
+    ),
     isLoading ? /* @__PURE__ */ jsx(Typography, { children: formatMessage({ id: getTranslation("settings.loading") }) }) : null,
     error ? /* @__PURE__ */ jsx(Typography, { textColor: "danger600", tag: "p", children: error }) : null,
     !isLoading && rows.length === 0 ? /* @__PURE__ */ jsx(Typography, { children: formatMessage({ id: getTranslation("settings.noRelations") }) }) : null,
@@ -196,6 +240,12 @@ const SettingsPage = () => {
       const targetAttributes = target?.attributes ?? {};
       const template = settings.relations[source.uid]?.[fieldName] ?? "";
       const validationError = template ? validateTemplate(template, targetAttributes, schemaMap) : null;
+      const availableFields = getAvailableFields(target, schemaMap);
+      const toggleField = (field) => {
+        const placeholder = `{${field}}`;
+        const nextTemplate = template.includes(placeholder) ? template.replaceAll(placeholder, "").replace(/\s{2,}/g, " ").trim() : `${template.trim()}${template.trim() ? " " : ""}${placeholder}`;
+        updateTemplate(source.uid, fieldName, nextTemplate);
+      };
       return /* @__PURE__ */ jsxs(
         Box,
         {
@@ -220,7 +270,9 @@ const SettingsPage = () => {
                 error: validationError ?? void 0,
                 name: `${source.uid}.${fieldName}`,
                 children: [
-                  /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({ id: getTranslation("settings.template") }) }),
+                  /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+                    id: getTranslation("settings.template")
+                  }) }),
                   /* @__PURE__ */ jsx(
                     TextInput,
                     {
@@ -234,18 +286,34 @@ const SettingsPage = () => {
                 ]
               }
             ),
-            /* @__PURE__ */ jsx(Box, { paddingTop: 2, children: /* @__PURE__ */ jsxs(Typography, { variant: "pi", textColor: "neutral600", children: [
-              formatMessage({ id: getTranslation("settings.availableFields") }),
-              ":",
-              " ",
-              getAvailableFields(target, schemaMap).join(", ")
-            ] }) })
+            /* @__PURE__ */ jsx(Box, { paddingTop: 2, children: /* @__PURE__ */ jsx(Accordion.Root, { collapsible: true, children: /* @__PURE__ */ jsxs(Accordion.Item, { value: "available-fields", children: [
+              /* @__PURE__ */ jsx(Accordion.Header, { children: /* @__PURE__ */ jsx(Accordion.Trigger, { children: formatMessage({
+                id: getTranslation("settings.availableFields")
+              }) }) }),
+              /* @__PURE__ */ jsx(Accordion.Content, { children: /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: availableFields.map((field, index) => {
+                const placeholder = `{${field}}`;
+                return /* @__PURE__ */ jsxs(Fragment, { children: [
+                  index > 0 ? ", " : null,
+                  /* @__PURE__ */ jsx(
+                    AvailableField,
+                    {
+                      as: "button",
+                      type: "button",
+                      variant: "pi",
+                      textColor: "neutral600",
+                      "aria-pressed": template.includes(placeholder),
+                      onClick: () => toggleField(field),
+                      children: field
+                    }
+                  )
+                ] }, field);
+              }) }) })
+            ] }) }) })
           ]
         },
         `${source.uid}.${fieldName}`
       );
-    }) : null,
-    !isLoading && rows.length > 0 ? /* @__PURE__ */ jsx(Flex, { justifyContent: "flex-end", paddingTop: 4, children: /* @__PURE__ */ jsx(Button, { loading: isSaving, disabled: isSaving, onClick: () => void save(), children: formatMessage({ id: getTranslation("settings.save") }) }) }) : null
+    }) : null
   ] }) });
 };
 export {

package/dist/admin/{de-a3KtzZ7N.mjs → de-Bc81LkbY.mjs}

@@ -1,7 +1,7 @@
 const de = {
   "plugin.name": "Relationsnamen",
   "settings.title": "Relationsnamen",
-  "settings.description": "Legen Sie fest, wie verknüpfte Einträge im Content Manager angezeigt werden. Verwenden Sie ein oder mehrere skalare Felder des verknüpften Inhaltstyps, zum Beispiel Vor- und Nachname.",
+  "settings.description": "Legen Sie fest, wie verknüpfte Einträge beschriftet werden, z. B. mit Vor- und Nachname.",
   "settings.target": "Verknüpfter Inhalt: {target}",
   "settings.template": "Bezeichnungsvorlage",
   "settings.availableFields": "Verfügbare Felder",

package/dist/admin/{de-BBrO1tf0.js → de-CsBvOsWR.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const de = {
   "plugin.name": "Relationsnamen",
   "settings.title": "Relationsnamen",
-  "settings.description": "Legen Sie fest, wie verknüpfte Einträge im Content Manager angezeigt werden. Verwenden Sie ein oder mehrere skalare Felder des verknüpften Inhaltstyps, zum Beispiel Vor- und Nachname.",
+  "settings.description": "Legen Sie fest, wie verknüpfte Einträge beschriftet werden, z. B. mit Vor- und Nachname.",
   "settings.target": "Verknüpfter Inhalt: {target}",
   "settings.template": "Bezeichnungsvorlage",
   "settings.availableFields": "Verfügbare Felder",

package/dist/admin/{en-8w3y1FSw.mjs → en-Bk-HIXNd.mjs}

@@ -1,7 +1,7 @@
 const en = {
   "plugin.name": "Relation Names",
   "settings.title": "Relation Names",
-  "settings.description": "Choose how related entries are displayed in the Content Manager. Use one or more scalar fields from the related content type, such as a first and last name.",
+  "settings.description": "Choose how related entries are labeled, using fields such as first and last name.",
   "settings.target": "Related content: {target}",
   "settings.template": "Label template",
   "settings.availableFields": "Available fields",

package/dist/admin/{en-DlY6ZGdo.js → en-DT4g6X2H.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const en = {
   "plugin.name": "Relation Names",
   "settings.title": "Relation Names",
-  "settings.description": "Choose how related entries are displayed in the Content Manager. Use one or more scalar fields from the related content type, such as a first and last name.",
+  "settings.description": "Choose how related entries are labeled, using fields such as first and last name.",
   "settings.target": "Related content: {target}",
   "settings.template": "Label template",
   "settings.availableFields": "Available fields",

package/dist/admin/{index-DGXo1dxk.mjs → index-CiS6cuI9.mjs}

@@ -88,7 +88,7 @@ const plugin = {
         id: `${PLUGIN_ID}.plugin.name`,
         defaultMessage: "Relation Names"
       },
-      Component: () => import("./SettingsPage-CpTyZSvB.mjs").then((module) => ({ default: module.SettingsPage })),
+      Component: () => import("./SettingsPage-DFZP5CZs.mjs").then((module) => ({ default: module.SettingsPage })),
       permissions: []
     });
     app.registerPlugin({
@@ -105,7 +105,7 @@ const plugin = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/de.json": () => import("./de-a3KtzZ7N.mjs"), "./translations/en.json": () => import("./en-8w3y1FSw.mjs") }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/de.json": () => import("./de-Bc81LkbY.mjs"), "./translations/en.json": () => import("./en-Bk-HIXNd.mjs") }), `./translations/${locale}.json`, 3);
           const newData = {};
           const keys = Object.keys(data);
           for (const key of keys) {

package/dist/admin/{index-CKaZcnCM.js → index-DfSAe961.js}

@@ -89,7 +89,7 @@ const plugin = {
         id: `${PLUGIN_ID}.plugin.name`,
         defaultMessage: "Relation Names"
       },
-      Component: () => Promise.resolve().then(() => require("./SettingsPage-CaBXOirN.js")).then((module2) => ({ default: module2.SettingsPage })),
+      Component: () => Promise.resolve().then(() => require("./SettingsPage-BebR4ghK.js")).then((module2) => ({ default: module2.SettingsPage })),
       permissions: []
     });
     app.registerPlugin({
@@ -106,7 +106,7 @@ const plugin = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/de.json": () => Promise.resolve().then(() => require("./de-BBrO1tf0.js")), "./translations/en.json": () => Promise.resolve().then(() => require("./en-DlY6ZGdo.js")) }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/de.json": () => Promise.resolve().then(() => require("./de-CsBvOsWR.js")), "./translations/en.json": () => Promise.resolve().then(() => require("./en-DT4g6X2H.js")) }), `./translations/${locale}.json`, 3);
           const newData = {};
           const keys = Object.keys(data);
           for (const key of keys) {

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-CKaZcnCM.js");
+const index = require("./index-DfSAe961.js");
 exports.default = index.plugin;

package/dist/admin/index.mjs

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

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

@@ -1,6 +1,8 @@
 type TemplateAttribute = {
     type?: string;
     component?: string;
+    target?: string;
+    targetModel?: string;
     private?: boolean;
 };
 type TemplateSchema = {

package/dist/server/index.js

@@ -164,6 +164,9 @@ 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);
 };
@@ -215,10 +218,11 @@ const compileTemplate = (template, targetSchema, resolveSchema) => {
       if (isLastSegment) {
         return SCALAR_TYPES.has(attribute.type ?? "");
       }
-      if (attribute.type !== "component" || !attribute.component || !resolveSchema) {
+      const nestedSchemaUid = attribute.type === "component" ? attribute.component : attribute.type === "relation" ? attribute.target : void 0;
+      if (!nestedSchemaUid || !resolveSchema) {
         return false;
       }
-      schema = resolveSchema(attribute.component);
+      schema = resolveSchema(nestedSchemaUid);
       if (!schema) {
         return false;
       }
@@ -329,10 +333,32 @@ const getRuntime = async (strapi, settings2, sourceUid, targetField, userAbility
   };
 };
 const buildPopulate = (placeholders) => {
-  const roots = new Set(
-    placeholders.filter((placeholder) => placeholder.includes(".")).map((placeholder) => placeholder.split(".")[0])
-  );
-  return roots.size > 0 ? Object.fromEntries(Array.from(roots, (root) => [root, true])) : void 0;
+  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);

package/dist/server/index.mjs

@@ -162,6 +162,9 @@ 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);
 };
@@ -213,10 +216,11 @@ const compileTemplate = (template, targetSchema, resolveSchema) => {
       if (isLastSegment) {
         return SCALAR_TYPES.has(attribute.type ?? "");
       }
-      if (attribute.type !== "component" || !attribute.component || !resolveSchema) {
+      const nestedSchemaUid = attribute.type === "component" ? attribute.component : attribute.type === "relation" ? attribute.target : void 0;
+      if (!nestedSchemaUid || !resolveSchema) {
         return false;
       }
-      schema = resolveSchema(attribute.component);
+      schema = resolveSchema(nestedSchemaUid);
       if (!schema) {
         return false;
       }
@@ -327,10 +331,32 @@ const getRuntime = async (strapi, settings2, sourceUid, targetField, userAbility
   };
 };
 const buildPopulate = (placeholders) => {
-  const roots = new Set(
-    placeholders.filter((placeholder) => placeholder.includes(".")).map((placeholder) => placeholder.split(".")[0])
-  );
-  return roots.size > 0 ? Object.fromEntries(Array.from(roots, (root) => [root, true])) : void 0;
+  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);

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

@@ -1,6 +1,9 @@
 import { Core } from '@strapi/strapi';
 import { SchemaLike } from './utils/relation-labels';
-declare const buildPopulate: (placeholders: string[]) => Record<string, true> | undefined;
+type Populate = Record<string, true | {
+    populate: Populate;
+}>;
+declare const buildPopulate: (placeholders: string[]) => Populate | undefined;
 declare const relationLabels: ({ strapi }: {
     strapi: Core.Strapi;
 }) => {

package/package.json

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