@fourlights/strapi-plugin-deep-populate 1.4.0 → 1.5.0

package/README.md

@@ -51,7 +51,7 @@ const document = await strapi.documents("api.page.page").findOne({
 
 ```ts
 // Get populate object for custom usage
-const { populate } = await strapi.plugin("deep-populate")
+const populate = await strapi.plugin("deep-populate")
   .service("populate")
   .get({
     documentId: 'xyz',
@@ -88,6 +88,7 @@ module.exports = ({ env }) => ({
       replaceWildcard: true,
       
       contentTypes: {
+        // '*' would apply to all content types
         'api::page.page': {
           deny: {
             relations: ['api::page.page']  // prevent resolving nested pages when populating a page

package/dist/server/index.js

@@ -14612,7 +14612,7 @@ const register = async ({ strapi: strapi2 }) => {
   });
 };
 const getHash = (params) => {
-  return `${params.contentType}-${params.documentId}-${params.locale}-${params.status}-${params.omitEmpty ? "sparse" : "full"}`;
+  return `${params.contentType}-${params.documentId}-${params.locale}-${params.status}-${params.omitEmpty ? "sparse" : "full"}-${params.localizations ? "all" : "single"}`;
 };
 const cache = ({ strapi: strapi2 }) => ({
   async get(params) {
@@ -14727,11 +14727,7 @@ async function _populateRelation({
   contentType,
   relation,
   resolvedRelations,
-  omitEmpty,
-  locale: locale2,
-  status: status2,
-  __deny,
-  __allow
+  ...params
 }) {
   const isSingleRelation = !Array.isArray(relation);
   const relations = isSingleRelation ? [relation] : relation;
@@ -14743,11 +14739,7 @@ async function _populateRelation({
       documentId: relation2.documentId,
       schema: contentType,
       resolvedRelations,
-      omitEmpty,
-      locale: locale2,
-      status: status2,
-      __deny,
-      __allow
+      ...params
     });
     resolvedRelations.set(relation2.documentId, relationPopulate);
   }
@@ -14824,7 +14816,11 @@ async function _populate({
   for (const [attrName, attr] of relations) {
     const value = _resolveValue({ document: document2, attrName, lookup });
     if (!hasValue(value)) {
-      if (!omitEmpty) newPopulate[attrName] = true;
+      if (omitEmpty !== true) newPopulate[attrName] = true;
+      continue;
+    }
+    if (params.localizations !== true && attrName === "localizations" && hasValue(value)) {
+      newPopulate[attrName] = true;
       continue;
     }
     if (contentTypes.isRelationalAttribute(attr)) {
@@ -14876,6 +14872,7 @@ async function _populate({
         omitEmpty,
         locale: params.locale,
         status: params.status,
+        localizations: params.localizations,
         __deny,
         __allow
       });
@@ -14901,7 +14898,10 @@ async function _populate({
 }
 async function populate$1(params) {
   const { contentTypes: contentTypes2 } = strapi.config.get("plugin::deep-populate");
-  const contentTypeConfig = ___default.has(contentTypes2, params.contentType) ? get__default.default(contentTypes2, params.contentType) : {};
+  const contentTypeConfig = has__default.default(contentTypes2, "*") ? get__default.default(contentTypes2, "*") : {};
+  if (has__default.default(contentTypes2, params.contentType)) {
+    mergeWith__default.default(contentTypeConfig, get__default.default(contentTypes2, params.contentType));
+  }
   const { allow, deny } = contentTypeConfig;
   const resolvedRelations = /* @__PURE__ */ new Map();
   const populated = await _populate({
@@ -14921,7 +14921,7 @@ const populate = ({ strapi: strapi2 }) => ({
     if (cachedEntry) return cachedEntry;
     const resolved = await populate$1(params);
     await strapi2.service("plugin::deep-populate.cache").set({ ...params, ...resolved });
-    return resolved;
+    return resolved.populate;
   }
 });
 const services = {

package/dist/server/index.mjs

@@ -1,6 +1,6 @@
 import isEmpty$1 from "lodash/isEmpty";
 import isObject$4 from "lodash/isObject";
-import ___default, { has as has$2 } from "lodash";
+import ___default from "lodash";
 import { curry, isArray, isObject as isObject$5, isEmpty as isEmpty$2, cloneDeep, omit, isNil, trim as trim$1, isString, pipe as pipe$1, split as split$1, map as map$2, flatten, first, identity, constant, join, eq, clone as clone$3, get, pick, has as has$1, union, getOr, toPath, isBoolean as isBoolean$1 } from "lodash/fp";
 import require$$1 from "crypto";
 import require$$0$1 from "child_process";
@@ -14587,7 +14587,7 @@ const register = async ({ strapi: strapi2 }) => {
   });
 };
 const getHash = (params) => {
-  return `${params.contentType}-${params.documentId}-${params.locale}-${params.status}-${params.omitEmpty ? "sparse" : "full"}`;
+  return `${params.contentType}-${params.documentId}-${params.locale}-${params.status}-${params.omitEmpty ? "sparse" : "full"}-${params.localizations ? "all" : "single"}`;
 };
 const cache = ({ strapi: strapi2 }) => ({
   async get(params) {
@@ -14702,11 +14702,7 @@ async function _populateRelation({
   contentType,
   relation,
   resolvedRelations,
-  omitEmpty,
-  locale: locale2,
-  status: status2,
-  __deny,
-  __allow
+  ...params
 }) {
   const isSingleRelation = !Array.isArray(relation);
   const relations = isSingleRelation ? [relation] : relation;
@@ -14718,11 +14714,7 @@ async function _populateRelation({
       documentId: relation2.documentId,
       schema: contentType,
       resolvedRelations,
-      omitEmpty,
-      locale: locale2,
-      status: status2,
-      __deny,
-      __allow
+      ...params
     });
     resolvedRelations.set(relation2.documentId, relationPopulate);
   }
@@ -14799,7 +14791,11 @@ async function _populate({
   for (const [attrName, attr] of relations) {
     const value = _resolveValue({ document: document2, attrName, lookup });
     if (!hasValue(value)) {
-      if (!omitEmpty) newPopulate[attrName] = true;
+      if (omitEmpty !== true) newPopulate[attrName] = true;
+      continue;
+    }
+    if (params.localizations !== true && attrName === "localizations" && hasValue(value)) {
+      newPopulate[attrName] = true;
       continue;
     }
     if (contentTypes.isRelationalAttribute(attr)) {
@@ -14851,6 +14847,7 @@ async function _populate({
         omitEmpty,
         locale: params.locale,
         status: params.status,
+        localizations: params.localizations,
         __deny,
         __allow
       });
@@ -14876,7 +14873,10 @@ async function _populate({
 }
 async function populate$1(params) {
   const { contentTypes: contentTypes2 } = strapi.config.get("plugin::deep-populate");
-  const contentTypeConfig = has$2(contentTypes2, params.contentType) ? get$1(contentTypes2, params.contentType) : {};
+  const contentTypeConfig = has(contentTypes2, "*") ? get$1(contentTypes2, "*") : {};
+  if (has(contentTypes2, params.contentType)) {
+    mergeWith(contentTypeConfig, get$1(contentTypes2, params.contentType));
+  }
   const { allow, deny } = contentTypeConfig;
   const resolvedRelations = /* @__PURE__ */ new Map();
   const populated = await _populate({
@@ -14896,7 +14896,7 @@ const populate = ({ strapi: strapi2 }) => ({
     if (cachedEntry) return cachedEntry;
     const resolved = await populate$1(params);
     await strapi2.service("plugin::deep-populate.cache").set({ ...params, ...resolved });
-    return resolved;
+    return resolved.populate;
   }
 });
 const services = {

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

@@ -14,7 +14,7 @@ type ContentTypeConfig = {
 export type Config = {
     useCache: boolean;
     replaceWildcard: boolean;
-    contentTypes: Record<UID.ContentType, ContentTypeConfig>;
+    contentTypes: Record<UID.ContentType | "*", ContentTypeConfig>;
 };
 declare const _default: {
     default: ({ env }: {

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

@@ -73,6 +73,7 @@ declare const _default: {
                 contentType: import("@strapi/types/dist/uid").ContentType;
                 documentId: string;
                 omitEmpty?: boolean;
+                localizations?: boolean;
             } & {
                 populate?: import("@strapi/types/dist/modules/documents/params/populate").Any<import("@strapi/types/dist/uid").ContentType>;
             } & {

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

@@ -14,6 +14,7 @@ declare const _default: {
             contentType: import("@strapi/types/dist/uid").ContentType;
             documentId: string;
             omitEmpty?: boolean;
+            localizations?: boolean;
         } & {
             populate?: import("@strapi/types/dist/modules/documents/params/populate").Any<import("@strapi/types/dist/uid").ContentType>;
         } & {

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

@@ -3,6 +3,7 @@ export type PopulateParams<TContentType extends UID.ContentType = UID.ContentTyp
     contentType: TContentType;
     documentId: string;
     omitEmpty?: boolean;
+    localizations?: boolean;
 };
 declare const _default: ({ strapi }: {
     strapi: Core.Strapi;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.0",
+  "version": "1.5.0",
   "keywords": [
     "strapi",
     "strapi-plugin",