strapi-plugin-navigation 2.1.0 → 2.2.0

package/server/services/client.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
-const slugify_1 = __importDefault(require("slugify"));
+const slugify_1 = __importDefault(require("@sindresorhus/slugify"));
 const uuid_1 = require("uuid");
 const types_1 = require("../../types");
 const utils_1 = require("../utils");
@@ -12,13 +12,13 @@ const utils_2 = require("@strapi/utils");
 const i18n_1 = require("../i18n");
 const NavigationError_1 = require("../../utils/NavigationError");
 const clientService = ({ strapi }) => ({
-    async render({ idOrSlug, type = utils_1.RENDER_TYPES.FLAT, menuOnly = false, rootPath = null, wrapRelated = false, locale, }) {
+    async render({ idOrSlug, type = utils_1.RENDER_TYPES.FLAT, menuOnly = false, rootPath = null, wrapRelated = false, locale, populate, }) {
         const clientService = (0, utils_1.getPluginService)('client');
         const findById = !isNaN((0, lodash_1.toNumber)(idOrSlug)) || (0, uuid_1.validate)(idOrSlug);
         const criteria = findById ? { id: idOrSlug } : { slug: idOrSlug };
         const itemCriteria = menuOnly ? { menuAttached: true } : {};
         return await clientService.renderType({
-            type, criteria, itemCriteria, filter: null, rootPath, wrapRelated, locale,
+            type, criteria, itemCriteria, filter: null, rootPath, wrapRelated, locale, populate
         });
     },
     async renderChildren({ idOrSlug, childUIKey, type = utils_1.RENDER_TYPES.FLAT, menuOnly = false, wrapRelated = false, locale, }) {
@@ -32,7 +32,7 @@ const clientService = ({ strapi }) => ({
         };
         return clientService.renderType({ type, criteria, itemCriteria, filter, rootPath: null, wrapRelated, locale });
     },
-    renderRFR(items, parent = null, parentNavItem = null, contentTypes = []) {
+    renderRFR({ items, parent = null, parentNavItem = null, contentTypes = [], enabledCustomFieldsNames, }) {
         const clientService = (0, utils_1.getPluginService)('client');
         let pages = {};
         let nav = {};
@@ -40,8 +40,8 @@ const clientService = ({ strapi }) => ({
         items.forEach(item => {
             const { items: itemChilds, ...itemProps } = item;
             const itemNav = clientService.renderRFRNav(itemProps);
-            const itemPage = clientService.renderRFRPage(itemProps, parent);
-            if (item.type === "INTERNAL") {
+            const itemPage = clientService.renderRFRPage(itemProps, parent, enabledCustomFieldsNames);
+            if (item.type !== "EXTERNAL") {
                 pages = {
                     ...pages,
                     [itemPage.id]: {
@@ -60,7 +60,7 @@ const clientService = ({ strapi }) => ({
             }
             else {
                 const navLevel = navItems
-                    .filter(navItem => navItem.type === "INTERNAL");
+                    .filter(navItem => navItem.type !== "EXTERNAL");
                 if (!(0, lodash_1.isEmpty)(navLevel))
                     nav = {
                         ...nav,
@@ -68,8 +68,20 @@ const clientService = ({ strapi }) => ({
                     };
             }
             if (!(0, lodash_1.isEmpty)(itemChilds)) {
-                const { nav: nestedNavs } = clientService.renderRFR(itemChilds, itemPage.id, itemNav, contentTypes);
-                const { pages: nestedPages } = clientService.renderRFR((itemChilds).filter(child => child.type === "INTERNAL"), itemPage.id, itemNav, contentTypes);
+                const { nav: nestedNavs } = clientService.renderRFR({
+                    items: itemChilds,
+                    parent: itemPage.id,
+                    parentNavItem: itemNav,
+                    contentTypes,
+                    enabledCustomFieldsNames,
+                });
+                const { pages: nestedPages } = clientService.renderRFR({
+                    items: (itemChilds).filter(child => child.type !== "EXTERNAL"),
+                    parent: itemPage.id,
+                    parentNavItem: itemNav,
+                    contentTypes,
+                    enabledCustomFieldsNames,
+                });
                 pages = {
                     ...pages,
                     ...nestedPages,
@@ -105,9 +117,14 @@ const clientService = ({ strapi }) => ({
                 page: uiRouterKey,
             };
         }
+        if (type === "WRAPPER") {
+            return {
+                ...itemCommon,
+            };
+        }
         throw new NavigationError_1.NavigationError("Unknown item type", item);
     },
-    renderRFRPage(item, parent) {
+    renderRFRPage(item, parent, enabledCustomFieldsNames) {
         const { uiRouterKey, title, path, slug, related, type, audience, menuAttached } = item;
         const { __contentType, id, __templateName } = related || {};
         const contentType = __contentType || '';
@@ -124,6 +141,7 @@ const clientService = ({ strapi }) => ({
             parent,
             audience,
             menuAttached,
+            ...enabledCustomFieldsNames.reduce((acc, field) => ({ ...acc, [field]: (0, lodash_1.get)(item, field) }), {})
         };
     },
     renderTree(items = [], id = null, field = 'parent', path = '', itemParser = (i) => i) {
@@ -152,7 +170,7 @@ const clientService = ({ strapi }) => ({
                 return 0;
         });
     },
-    async renderType({ type = utils_1.RENDER_TYPES.FLAT, criteria = {}, itemCriteria = {}, filter = null, rootPath = null, wrapRelated = false, locale, }) {
+    async renderType({ type = utils_1.RENDER_TYPES.FLAT, criteria = {}, itemCriteria = {}, filter = null, rootPath = null, wrapRelated = false, locale, populate, }) {
         const clientService = (0, utils_1.getPluginService)('client');
         const adminService = (0, utils_1.getPluginService)('admin');
         const commonService = (0, utils_1.getPluginService)('common');
@@ -160,7 +178,7 @@ const clientService = ({ strapi }) => ({
             ...criteria,
             visible: true,
         };
-        const { masterModel, itemModel } = (0, utils_1.extractMeta)(strapi.plugins);
+        const { masterModel, itemModel } = (0, utils_1.getPluginModels)();
         const entity = await (0, i18n_1.i18nAwareEntityReadHandler)({
             entity: await strapi
                 .query(masterModel.uid)
@@ -185,8 +203,10 @@ const clientService = ({ strapi }) => ({
             if (!entities) {
                 return [];
             }
-            const items = await commonService.getRelatedItems(entities);
-            const { contentTypes, contentTypesNameFields } = await adminService.config(false);
+            const items = await commonService.getRelatedItems(entities, populate);
+            const { contentTypes, contentTypesNameFields, additionalFields, slugify: customSlugifyConfig } = await adminService.config(false);
+            const enabledCustomFieldsNames = (0, utils_1.getCustomFields)(additionalFields)
+                .reduce((acc, curr) => curr.enabled ? [...acc, curr.name] : acc, []);
             const wrapContentType = (itemContentType) => wrapRelated && itemContentType ? {
                 id: itemContentType.id,
                 attributes: { ...itemContentType }
@@ -200,7 +220,7 @@ const clientService = ({ strapi }) => ({
                         const parentPath = isExternal ? undefined : `${path === '/' ? '' : path}/${(0, lodash_1.first)(item.path) === '/'
                             ? item.path.substring(1)
                             : item.path}`;
-                        const slug = (0, lodash_1.isString)(parentPath) ? (0, slugify_1.default)(((0, lodash_1.first)(parentPath) === '/' ? parentPath.substring(1) : parentPath).replace(/\//g, '-')) : undefined;
+                        const slug = (0, lodash_1.isString)(parentPath) ? (0, slugify_1.default)(((0, lodash_1.first)(parentPath) === '/' ? parentPath.substring(1) : parentPath).replace(/\//g, '-'), customSlugifyConfig) : undefined;
                         const lastRelated = (0, lodash_1.isArray)(item.related) ? (0, lodash_1.last)(item.related) : item.related;
                         const relatedContentType = wrapContentType(lastRelated);
                         return {
@@ -211,14 +231,15 @@ const clientService = ({ strapi }) => ({
                             path: isExternal ? item.externalPath : parentPath,
                             type: item.type,
                             uiRouterKey: item.uiRouterKey,
-                            slug: !slug && item.uiRouterKey ? (0, slugify_1.default)(item.uiRouterKey) : slug,
+                            slug: !slug && item.uiRouterKey ? (0, slugify_1.default)(item.uiRouterKey, customSlugifyConfig) : slug,
                             external: isExternal,
                             related: isExternal || !lastRelated ? undefined : {
                                 ...relatedContentType,
                                 __templateName: getTemplateName((lastRelated.relatedType || lastRelated.__contentType), lastRelated.id),
                             },
-                            audience: !(0, lodash_1.isEmpty)(item.audience) ? item.audience.map(aItem => (aItem).key) : undefined,
+                            audience: !(0, lodash_1.isEmpty)(item.audience) ? item.audience.map(({ key }) => key) : undefined,
                             items: isExternal ? undefined : clientService.renderTree(items, item.id, field, parentPath, itemParser),
+                            ...enabledCustomFieldsNames.reduce((acc, field) => ({ ...acc, [field]: (0, lodash_1.get)(item, `additionalFields.${field}`) }), {}),
                         };
                     };
                     const { items: itemsFilteredByPath, root: rootElement, } = (0, utils_1.filterByPath)(items, rootPath);
@@ -227,19 +248,41 @@ const clientService = ({ strapi }) => ({
                         ? treeStructure.filter((item) => item.uiRouterKey === filter)
                         : treeStructure;
                     if (type === utils_1.RENDER_TYPES.RFR) {
-                        return clientService.renderRFR(filteredStructure, null, null, contentTypes);
+                        return clientService.renderRFR({
+                            items: filteredStructure,
+                            contentTypes,
+                            enabledCustomFieldsNames,
+                        });
                     }
                     return filteredStructure;
                 default:
                     const publishedItems = items.filter(utils_1.filterOutUnpublished);
                     const result = (0, lodash_1.isNil)(rootPath) ? items : (0, utils_1.filterByPath)(publishedItems, rootPath).items;
-                    return result.map((item) => ({
+                    const defaultCache = new Map();
+                    const getNestedOrders = (id, cache = defaultCache) => {
+                        const cached = cache.get(id);
+                        if (!(0, lodash_1.isNil)(cached))
+                            return cached;
+                        const item = result.find(item => item.id === id);
+                        if ((0, lodash_1.isNil)(item))
+                            throw new Error("Item not found");
+                        const { order, parent } = item;
+                        const nestedOrders = parent
+                            ? getNestedOrders(parent.id, cache).concat(order)
+                            : [order];
+                        cache.set(id, nestedOrders);
+                        return nestedOrders;
+                    };
+                    return result
+                        .map(({ additionalFields, ...item }) => ({
                         ...item,
                         audience: item.audience?.map(_ => (_).key),
-                        title: (0, utils_1.composeItemTitle)(item, contentTypesNameFields, contentTypes) || '',
+                        title: (0, utils_1.composeItemTitle)({ ...item, additionalFields }, contentTypesNameFields, contentTypes) || '',
                         related: wrapContentType(item.related),
                         items: null,
-                    }));
+                        ...enabledCustomFieldsNames.reduce((acc, name) => ({ ...acc, [name]: (0, lodash_1.get)(additionalFields, name, undefined) }), {}),
+                    }))
+                        .sort((a, b) => (0, utils_1.compareArraysOfNumbers)(getNestedOrders(a.id), getNestedOrders(b.id)));
             }
         }
         throw new utils_2.errors.NotFoundError();

package/server/services/common.js

@@ -110,7 +110,7 @@ const commonService = ({ strapi }) => ({
     },
     async createBranch(items, masterEntity, parentItem, operations) {
         const commonService = (0, utils_2.getPluginService)('common');
-        const { itemModel } = (0, utils_2.extractMeta)(strapi.plugins);
+        const { itemModel } = (0, utils_2.getPluginModels)();
         return await Promise.all(items.map(async (item) => {
             operations.create = true;
             const { parent, master, related, ...params } = item;
@@ -197,7 +197,7 @@ const commonService = ({ strapi }) => ({
     async getPluginStore() {
         return await strapi.store({ type: 'plugin', name: 'navigation' });
     },
-    async getRelatedItems(entityItems) {
+    async getRelatedItems(entityItems, populate) {
         const commonService = (0, utils_2.getPluginService)('common');
         const pluginStore = await commonService.getPluginStore();
         const config = await pluginStore.get({ key: 'config' });
@@ -207,7 +207,7 @@ const commonService = ({ strapi }) => ({
                 ...(acc[relatedType] || []),
                 ...entityItems
                     .filter((item => (0, lodash_1.get)(item.related, 'related_type') === relatedType))
-                    .flatMap((item) => Object.assign(item.related, { navigationItemId: item.id })),
+                    .flatMap((item) => Object.assign(item.related || {}, { navigationItemId: item.id })),
             ],
         }), {});
         const data = new Map((await Promise.all(Object.entries(groupedItems)
@@ -218,7 +218,7 @@ const commonService = ({ strapi }) => ({
                 where: {
                     id: { $in: (0, lodash_1.map)(related, 'related_id') },
                 },
-                populate: config.contentTypesPopulate[model] || []
+                populate: (0, lodash_1.isNil)(populate) ? config.contentTypesPopulate[model] || [] : (0, utils_2.parsePopulateQuery)(populate)
             });
             return relationData
                 .flatMap(_ => Object.assign(_, {
@@ -239,7 +239,7 @@ const commonService = ({ strapi }) => ({
     },
     removeBranch(items = [], operations = {}) {
         const commonService = (0, utils_2.getPluginService)('common');
-        const { itemModel } = (0, utils_2.extractMeta)(strapi.plugins);
+        const { itemModel } = (0, utils_2.getPluginModels)();
         return Promise.all(items
             .filter(item => item.id)
             .map(async (item) => {
@@ -273,7 +273,7 @@ const commonService = ({ strapi }) => ({
     },
     async updateBranch(toUpdate, masterEntity, parentItem, operations) {
         const commonService = (0, utils_2.getPluginService)('common');
-        const { itemModel } = (0, utils_2.extractMeta)(strapi.plugins);
+        const { itemModel } = (0, utils_2.getPluginModels)();
         const databaseModel = strapi.query(itemModel.uid);
         return Promise.all(toUpdate.map(async (item) => {
             operations.update = true;
@@ -307,6 +307,25 @@ const commonService = ({ strapi }) => ({
             model: model.modelName,
             entry: sanitizedEntity,
         });
+    },
+    async pruneCustomFields(removedFields) {
+        const { itemModel } = (0, utils_2.getPluginModels)();
+        const databaseModel = strapi.query(itemModel.uid);
+        const removedFieldsNames = removedFields.map(({ name }) => name);
+        const navigationItems = await databaseModel.findMany({
+            where: {
+                additionalFields: {
+                    $contains: [removedFieldsNames]
+                }
+            }
+        });
+        const navigationItemsToUpdate = removedFields.reduce((acc, curr) => {
+            return acc.map((item) => (0, lodash_1.omit)(item, [`additionalFields.${curr.name}`]));
+        }, navigationItems);
+        await Promise.all(navigationItemsToUpdate.map(async (item) => await databaseModel.update({
+            where: { id: item.id },
+            data: { additionalFields: item.additionalFields },
+        })));
     }
 });
 exports.default = commonService;

package/server/utils/constant.d.ts

@@ -10,9 +10,6 @@ export declare const ALLOWED_CONTENT_TYPES: readonly ["api::", "plugin::"];
 export declare const RESTRICTED_CONTENT_TYPES: readonly ["plugin::users-permissions", "plugin::i18n.locale", "plugin::navigation"];
 export declare const EXCLUDED_CONTENT_TYPES: string[];
 export declare const CONTENT_TYPES_NAME_FIELDS_DEFAULTS: string[];
-export declare const ADDITIONAL_FIELDS: {
-    AUDIENCE: string;
-};
 export declare const DEFAULT_POPULATE: "localizations"[];
 export declare const DEFAULT_NAVIGATION_ITEM: {
     readonly name: "Main navigation";

package/server/utils/constant.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RENDER_TYPES = exports.DEFAULT_NAVIGATION_ITEM = exports.DEFAULT_POPULATE = exports.ADDITIONAL_FIELDS = exports.CONTENT_TYPES_NAME_FIELDS_DEFAULTS = exports.EXCLUDED_CONTENT_TYPES = exports.RESTRICTED_CONTENT_TYPES = exports.ALLOWED_CONTENT_TYPES = exports.KIND_TYPES = exports.MODEL_TYPES = exports.TEMPLATE_DEFAULT = void 0;
+exports.RENDER_TYPES = exports.DEFAULT_NAVIGATION_ITEM = exports.DEFAULT_POPULATE = exports.CONTENT_TYPES_NAME_FIELDS_DEFAULTS = exports.EXCLUDED_CONTENT_TYPES = exports.RESTRICTED_CONTENT_TYPES = exports.ALLOWED_CONTENT_TYPES = exports.KIND_TYPES = exports.MODEL_TYPES = exports.TEMPLATE_DEFAULT = void 0;
 const i18n_1 = require("../i18n");
 exports.TEMPLATE_DEFAULT = 'Generic';
 exports.MODEL_TYPES = { CONTENT_TYPE: 'contentType' };
@@ -9,7 +9,6 @@ exports.ALLOWED_CONTENT_TYPES = ['api::', 'plugin::'];
 exports.RESTRICTED_CONTENT_TYPES = ['plugin::users-permissions', 'plugin::i18n.locale', 'plugin::navigation'];
 exports.EXCLUDED_CONTENT_TYPES = ['strapi::'];
 exports.CONTENT_TYPES_NAME_FIELDS_DEFAULTS = ['title', 'subject', 'name'];
-exports.ADDITIONAL_FIELDS = { AUDIENCE: 'audience' };
 exports.DEFAULT_POPULATE = [...i18n_1.I18N_DEFAULT_POPULATE];
 exports.DEFAULT_NAVIGATION_ITEM = {
     name: "Main navigation",

package/server/utils/functions.d.ts

@@ -1,8 +1,10 @@
-import { Id, IStrapi, Primitive, StrapiContentType, StrapiPlugin, StringMap } from "strapi-typed";
-import { AuditLogContext, AuditLogParams, ContentTypeEntity, NavigationActions, NavigationItem, NavigationItemEntity, NavigationService, NavigationServiceName, NestedPath, NestedStructure, PluginConfigNameFields, ToBeFixed } from "../../types";
+import { PopulateClause } from 'strapi-typed';
+import { Id, IStrapi, Primitive, StrapiContentType, StringMap, StrapiContentTypeFullSchema } from "strapi-typed";
+import { AuditLogContext, AuditLogParams, ContentTypeEntity, NavigationActions, NavigationItem, NavigationItemAdditionalField, NavigationItemCustomField, NavigationItemEntity, NavigationService, NavigationServiceName, NestedPath, NestedStructure, PluginConfigNameFields, PopulateQueryParam, ToBeFixed } from "../../types";
 import { NavigationError } from '../../utils/NavigationError';
 export declare const getPluginService: <T extends NavigationService>(name: NavigationServiceName) => T;
 export declare const errorHandler: (ctx: ToBeFixed) => (error: NavigationError | string) => any;
+export declare const getCustomFields: (additionalFields: NavigationItemAdditionalField[]) => NavigationItemCustomField[];
 export declare const parseParams: <TParams extends StringMap<string> = StringMap<string>, TResult extends StringMap<Primitive> = StringMap<Primitive>>(params: TParams) => TResult;
 export declare const templateNameFactory: (items: import("strapi-typed").TypeResult<{
     path: string | null;
@@ -46,11 +48,13 @@ export declare const templateNameFactory: (items: import("strapi-typed").TypeRes
         audience: import("../../types").Audience[];
         externalPath: string | null;
         related: import("../../types").NavigationItemRelated | null;
+        additionalFields: StringMap<string | boolean>;
     }> | null;
     master: import("../../types").Navigation;
     audience: import("../../types").Audience[];
     externalPath: string | null;
     related: ContentTypeEntity | ContentTypeEntity[] | null;
+    additionalFields: StringMap<string | boolean>;
 }>[] | undefined, strapi: IStrapi, contentTypes?: StrapiContentType<ToBeFixed>[]) => Promise<(contentType: ToBeFixed, id: Id) => any>;
 export declare const getTemplateComponentFromTemplate: (strapi: IStrapi, template?: ToBeFixed[]) => any;
 export declare const prepareAuditLog: (actions: NavigationActions[]) => string;
@@ -60,16 +64,6 @@ export declare const extractItemRelationTitle: (relatedItem: ContentTypeEntity,
 export declare const filterOutUnpublished: (item: NavigationItemEntity<ContentTypeEntity | ContentTypeEntity[]>) => unknown;
 export declare const checkDuplicatePath: (parentItem: ToBeFixed | null, checkData: NavigationItem[]) => Promise<void>;
 export declare const singularize: (value?: string) => string;
-export declare const extractMeta: (plugins: {
-    [uid: string]: StrapiPlugin;
-}) => {
-    masterModel: any;
-    itemModel: any;
-    relatedModel: any;
-    audienceModel: any;
-    plugin: StrapiPlugin;
-    pluginName: string;
-};
 export declare const buildNestedStructure: (entities: NavigationItemEntity<ContentTypeEntity>[], id?: Id | null, field?: keyof NavigationItemEntity) => NestedStructure<NavigationItemEntity<ContentTypeEntity>>[];
 export declare const buildNestedPaths: <T extends Pick<import("strapi-typed").TypeResult<{
     path: string | null;
@@ -100,6 +94,7 @@ export declare const buildNestedPaths: <T extends Pick<import("strapi-typed").Ty
     audience: import("../../types").Audience[];
     externalPath: string | null;
     related: import("../../types").NavigationItemRelated | null;
+    additionalFields: StringMap<string | boolean>;
 }>, "id" | "path" | "parent">>(items: T[], id?: Id | null, parentPath?: string | null) => NestedPath[];
 export declare const filterByPath: <T extends Pick<import("strapi-typed").TypeResult<{
     path: string | null;
@@ -130,10 +125,15 @@ export declare const filterByPath: <T extends Pick<import("strapi-typed").TypeRe
     audience: import("../../types").Audience[];
     externalPath: string | null;
     related: import("../../types").NavigationItemRelated | null;
+    additionalFields: StringMap<string | boolean>;
 }>, "id" | "path" | "parent">>(items: T[], path: string | null) => {
     root?: NestedPath | undefined;
     items: T[];
 };
 export declare const isContentTypeEligible: (uid?: string) => boolean | "";
 export declare const intercalate: <T, U extends T>(glue: T, arr: U[]) => (T | U)[];
+export declare const compareArraysOfNumbers: (arrA: number[], arrB: number[]) => number;
+export declare const getPluginModels: () => Record<'masterModel' | 'itemModel' | 'relatedModel' | 'audienceModel', StrapiContentTypeFullSchema>;
+export declare const validateAdditionalFields: (additionalFields: NavigationItemAdditionalField[]) => void;
+export declare const parsePopulateQuery: (populate: PopulateQueryParam) => PopulateClause;
 //# sourceMappingURL=functions.d.ts.map

package/server/utils/functions.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.intercalate = exports.isContentTypeEligible = exports.filterByPath = exports.buildNestedPaths = exports.buildNestedStructure = exports.extractMeta = exports.singularize = exports.checkDuplicatePath = exports.filterOutUnpublished = exports.extractItemRelationTitle = exports.composeItemTitle = exports.sendAuditLog = exports.prepareAuditLog = exports.getTemplateComponentFromTemplate = exports.templateNameFactory = exports.parseParams = exports.errorHandler = exports.getPluginService = void 0;
+exports.parsePopulateQuery = exports.validateAdditionalFields = exports.getPluginModels = exports.compareArraysOfNumbers = exports.intercalate = exports.isContentTypeEligible = exports.filterByPath = exports.buildNestedPaths = exports.buildNestedStructure = exports.singularize = exports.checkDuplicatePath = exports.filterOutUnpublished = exports.extractItemRelationTitle = exports.composeItemTitle = exports.sendAuditLog = exports.prepareAuditLog = exports.getTemplateComponentFromTemplate = exports.templateNameFactory = exports.parseParams = exports.getCustomFields = exports.errorHandler = exports.getPluginService = void 0;
 const lodash_1 = require("lodash");
+const types_1 = require("../../types");
 const NavigationError_1 = require("../../utils/NavigationError");
 const constant_1 = require("./constant");
 const getPluginService = (name) => strapi.plugin("navigation").service(name);
@@ -13,6 +14,8 @@ const errorHandler = (ctx) => (error) => {
     throw error;
 };
 exports.errorHandler = errorHandler;
+const getCustomFields = (additionalFields) => additionalFields.filter(field => typeof field !== 'string');
+exports.getCustomFields = getCustomFields;
 const parseParams = (params) => Object.keys(params).reduce((prev, curr) => {
     const value = params[curr];
     const parsedValue = isNaN(Number(value)) ? value : parseInt(value, 10);
@@ -25,24 +28,21 @@ exports.parseParams = parseParams;
 const templateNameFactory = async (items = [], strapi, contentTypes = []) => {
     const flatRelated = (0, lodash_1.flatten)(items.map(i => i.related)).filter(_ => !!_);
     const relatedMap = (flatRelated).reduce((acc, curr) => {
-        if (curr === null)
+        if ((0, lodash_1.isNil)(curr) || typeof curr.__contentType !== "string")
             return acc;
         const index = curr.__contentType;
-        if (typeof index !== 'string')
-            return acc;
-        if (!acc[index]) {
+        if ((0, lodash_1.isNil)(acc[index]))
             acc[index] = [];
-        }
-        acc[index].push(curr.id);
-        return acc;
+        return { ...acc, [index]: [...acc[index], curr.id] };
     }, {});
     const responses = await Promise.all(Object.entries(relatedMap)
         .map(([contentType, ids]) => {
-        const contentTypeUid = (0, lodash_1.get)((0, lodash_1.find)(contentTypes, cnt => cnt.uid === contentType), 'uid');
-        return strapi.query(contentTypeUid)
+        (0, types_1.assertNotEmpty)((0, lodash_1.find)(contentTypes, cnt => cnt.uid === contentType));
+        return strapi.query(contentType)
             .findMany({
             where: { id: { $in: ids } },
             limit: Number.MAX_SAFE_INTEGER,
+            populate: ["template"],
         })
             .then(res => ({ [contentType]: res }));
     }));
@@ -141,18 +141,6 @@ const singularize = (value = '') => {
     return (0, lodash_1.last)(value) === 's' ? value.substr(0, value.length - 1) : value;
 };
 exports.singularize = singularize;
-const extractMeta = (plugins) => {
-    const { navigation: plugin } = plugins;
-    return {
-        masterModel: plugin.contentType('navigation'),
-        itemModel: plugin.contentType('navigation-item'),
-        relatedModel: plugin.contentType('navigations-items-related'),
-        audienceModel: plugin.contentType('audience'),
-        plugin,
-        pluginName: 'navigation',
-    };
-};
-exports.extractMeta = extractMeta;
 const buildNestedStructure = (entities, id = null, field = 'parent') => {
     return entities
         .filter(entity => {
@@ -223,4 +211,54 @@ const isContentTypeEligible = (uid = '') => {
 exports.isContentTypeEligible = isContentTypeEligible;
 const intercalate = (glue, arr) => arr.slice(1).reduce((acc, element) => acc.concat([glue, element]), arr.slice(0, 1));
 exports.intercalate = intercalate;
+const compareArraysOfNumbers = (arrA, arrB) => {
+    const diff = (0, lodash_1.zipWith)(arrA, arrB, (a, b) => {
+        if ((0, lodash_1.isNil)(a))
+            return -1;
+        if ((0, lodash_1.isNil)(b))
+            return 1;
+        return a - b;
+    });
+    return (0, lodash_1.find)(diff, a => a !== 0) || 0;
+};
+exports.compareArraysOfNumbers = compareArraysOfNumbers;
+const getPluginModels = () => {
+    const plugin = strapi.plugin('navigation');
+    return {
+        masterModel: plugin.contentType('navigation'),
+        itemModel: plugin.contentType('navigation-item'),
+        relatedModel: plugin.contentType('navigations-items-related'),
+        audienceModel: plugin.contentType('audience'),
+    };
+};
+exports.getPluginModels = getPluginModels;
+const validateAdditionalFields = (additionalFields) => {
+    const forbiddenNames = [
+        'title', 'type', 'path',
+        'externalPath', 'uiRouterKey', 'menuAttached',
+        'order', 'collapsed', 'related',
+        'parent', 'master', 'audience',
+        'additionalFields',
+    ];
+    const customFields = (0, exports.getCustomFields)(additionalFields);
+    if (customFields.length !== (0, lodash_1.uniqBy)(customFields, 'name').length) {
+        throw new Error('All names of custom fields must be unique.');
+    }
+    if (!(0, lodash_1.isNil)((0, lodash_1.find)(customFields, item => (0, lodash_1.includes)(forbiddenNames, item.name)))) {
+        throw new Error(`Name of custom field cannot be one of: ${forbiddenNames.join(', ')}`);
+    }
+};
+exports.validateAdditionalFields = validateAdditionalFields;
+const parsePopulateQuery = (populate) => {
+    if (populate === "*") {
+        return true;
+    }
+    else if (typeof populate === "string") {
+        return [populate];
+    }
+    else {
+        return populate;
+    }
+};
+exports.parsePopulateQuery = parsePopulateQuery;
 //# sourceMappingURL=functions.js.map

package/strapi-server.d.ts

@@ -28,13 +28,6 @@ declare const _default: () => {
             };
         };
         navigation: {
-            lifecycle: {
-                renderType: {
-                    FLAT: string;
-                    TREE: string;
-                    RFR: string;
-                };
-            };
             schema: {
                 collectionName: string;
                 info: {
@@ -90,19 +83,6 @@ declare const _default: () => {
             };
         };
         "navigation-item": {
-            lifecycle: {
-                type: {
-                    INTERNAL: string;
-                    EXTERNAL: string;
-                    WRAPPER: string;
-                };
-                additionalFields: {
-                    AUDIENCE: string;
-                };
-                lifecycles: {
-                    afterFind(results: any): void;
-                };
-            };
             schema: {
                 collectionName: string;
                 info: {
@@ -196,15 +176,15 @@ declare const _default: () => {
                         relation: string;
                         target: string;
                     };
+                    additionalFields: {
+                        type: string;
+                        require: boolean;
+                        default: {};
+                    };
                 };
             };
         };
         "navigations-items-related": {
-            lifecycle: {
-                lifecycles: {
-                    afterFind(results: any): void;
-                };
-            };
             schema: {
                 collectionName: string;
                 info: {