strapi-relation-names 1.1.0 → 1.2.0

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-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-CKaZcnCM.js");
+const index = require("./index-DFr0KRky.js");
 const FIELD_TYPES = /* @__PURE__ */ new Set([
   "string",
   "text",
@@ -31,6 +31,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 +83,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,14 +105,15 @@ 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 : [];

package/dist/admin/{SettingsPage-CpTyZSvB.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-DGXo1dxk.mjs";
+import { g as getTranslation } from "./index-DdvdGn6T.mjs";
 const FIELD_TYPES = /* @__PURE__ */ new Set([
   "string",
   "text",
@@ -29,6 +29,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 +81,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,14 +103,15 @@ 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 : [];

package/dist/admin/{index-CKaZcnCM.js → index-DFr0KRky.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-BGsuRnwx.js")).then((module2) => ({ default: module2.SettingsPage })),
       permissions: []
     });
     app.registerPlugin({

package/dist/admin/{index-DGXo1dxk.mjs → index-DdvdGn6T.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-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-CKaZcnCM.js");
+const index = require("./index-DFr0KRky.js");
 exports.default = index.plugin;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { p } from "./index-DGXo1dxk.mjs";
+import { p } from "./index-DdvdGn6T.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.0",
   "strapi": {
     "kind": "plugin",
     "name": "strapi-relation-names",