@fourlights/strapi-plugin-deep-populate 1.15.0 → 1.16.0-beta.0

package/dist/server/index.js

@@ -24,6 +24,7 @@ const cloneDeep = require("lodash/cloneDeep");
 const unset = require("lodash/unset");
 const get = require("lodash/get");
 const isEqual = require("lodash/isEqual");
+const clone$2 = require("lodash/clone");
 const merge$2 = require("lodash/merge");
 const mergeWith = require("lodash/mergeWith");
 const set$2 = require("lodash/set");
@@ -51,6 +52,7 @@ const cloneDeep__default = /* @__PURE__ */ _interopDefault(cloneDeep);
 const unset__default = /* @__PURE__ */ _interopDefault(unset);
 const get__default = /* @__PURE__ */ _interopDefault(get);
 const isEqual__default = /* @__PURE__ */ _interopDefault(isEqual);
+const clone__default = /* @__PURE__ */ _interopDefault(clone$2);
 const merge__default = /* @__PURE__ */ _interopDefault(merge$2);
 const mergeWith__default = /* @__PURE__ */ _interopDefault(mergeWith);
 const set__default = /* @__PURE__ */ _interopDefault(set$2);
@@ -160,73 +162,76 @@ function envFn(key, defaultValue) {
 function getKey(key) {
   return process.env[key] ?? "";
 }
-const utils$2 = {
-  int(key, defaultValue) {
-    if (!___default__default.default.has(process.env, key)) {
-      return defaultValue;
-    }
-    return parseInt(getKey(key), 10);
-  },
-  float(key, defaultValue) {
-    if (!___default__default.default.has(process.env, key)) {
-      return defaultValue;
-    }
-    return parseFloat(getKey(key));
-  },
-  bool(key, defaultValue) {
-    if (!___default__default.default.has(process.env, key)) {
-      return defaultValue;
-    }
-    return getKey(key) === "true";
-  },
-  json(key, defaultValue) {
-    if (!___default__default.default.has(process.env, key)) {
-      return defaultValue;
-    }
-    try {
-      return JSON.parse(getKey(key));
-    } catch (error2) {
-      if (error2 instanceof Error) {
-        throw new Error(`Invalid json environment variable ${key}: ${error2.message}`);
-      }
-      throw error2;
-    }
-  },
-  array(key, defaultValue) {
-    if (!___default__default.default.has(process.env, key)) {
-      return defaultValue;
-    }
-    let value = getKey(key);
-    if (value.startsWith("[") && value.endsWith("]")) {
-      value = value.substring(1, value.length - 1);
-    }
-    return value.split(",").map((v) => {
-      return ___default__default.default.trim(___default__default.default.trim(v, " "), '"');
-    });
-  },
-  date(key, defaultValue) {
-    if (!___default__default.default.has(process.env, key)) {
-      return defaultValue;
-    }
-    return new Date(getKey(key));
-  },
-  /**
-  * Gets a value from env that matches oneOf provided values
-  * @param {string} key
-  * @param {string[]} expectedValues
-  * @param {string|undefined} defaultValue
-  * @returns {string|undefined}
-  */
-  oneOf(key, expectedValues, defaultValue) {
-    if (!expectedValues) {
-      throw new Error(`env.oneOf requires expectedValues`);
-    }
-    if (defaultValue && !expectedValues.includes(defaultValue)) {
-      throw new Error(`env.oneOf requires defaultValue to be included in expectedValues`);
+function int$2(key, defaultValue) {
+  if (!___default__default.default.has(process.env, key)) {
+    return defaultValue;
+  }
+  return parseInt(getKey(key), 10);
+}
+function float$1(key, defaultValue) {
+  if (!___default__default.default.has(process.env, key)) {
+    return defaultValue;
+  }
+  return parseFloat(getKey(key));
+}
+function bool$1(key, defaultValue) {
+  if (!___default__default.default.has(process.env, key)) {
+    return defaultValue;
+  }
+  return getKey(key) === "true";
+}
+function json$1(key, defaultValue) {
+  if (!___default__default.default.has(process.env, key)) {
+    return defaultValue;
+  }
+  try {
+    return JSON.parse(getKey(key));
+  } catch (error2) {
+    if (error2 instanceof Error) {
+      throw new Error(`Invalid json environment variable ${key}: ${error2.message}`);
     }
-    const rawValue = env(key, defaultValue);
-    return expectedValues.includes(rawValue) ? rawValue : defaultValue;
+    throw error2;
   }
+}
+function array$2(key, defaultValue) {
+  if (!___default__default.default.has(process.env, key)) {
+    return defaultValue;
+  }
+  let value = getKey(key);
+  if (value.startsWith("[") && value.endsWith("]")) {
+    value = value.substring(1, value.length - 1);
+  }
+  return value.split(",").map((v) => {
+    return ___default__default.default.trim(___default__default.default.trim(v, " "), '"');
+  });
+}
+function date$3(key, defaultValue) {
+  if (!___default__default.default.has(process.env, key)) {
+    return defaultValue;
+  }
+  return new Date(getKey(key));
+}
+function oneOf(key, expectedValues, defaultValue) {
+  if (!expectedValues) {
+    throw new Error(`env.oneOf requires expectedValues`);
+  }
+  if (defaultValue && !expectedValues.includes(defaultValue)) {
+    throw new Error(`env.oneOf requires defaultValue to be included in expectedValues`);
+  }
+  const rawValue = env(key, defaultValue);
+  if (rawValue !== void 0 && expectedValues.includes(rawValue)) {
+    return rawValue;
+  }
+  return defaultValue;
+}
+const utils$2 = {
+  int: int$2,
+  float: float$1,
+  bool: bool$1,
+  json: json$1,
+  array: array$2,
+  date: date$3,
+  oneOf
 };
 const env = Object.assign(envFn, utils$2);
 const ID_ATTRIBUTE$1 = "id";
@@ -265,10 +270,10 @@ const HAS_RELATION_REORDERING = [
   "oneToMany"
 ];
 const hasRelationReordering = (attribute) => isRelationalAttribute(attribute) && HAS_RELATION_REORDERING.includes(attribute.relation);
-const isComponentAttribute = (attribute) => [
+const isComponentAttribute = (attribute) => !!attribute && [
   "component",
   "dynamiczone"
-].includes(attribute?.type);
+].includes(attribute.type);
 const isDynamicZoneAttribute = (attribute) => !!attribute && attribute.type === "dynamiczone";
 const isMorphToRelationalAttribute = (attribute) => {
   return !!attribute && isRelationalAttribute(attribute) && attribute.relation?.startsWith?.("morphTo");
@@ -285,12 +290,22 @@ const getRelationalAttributes = (schema2) => {
     return acc;
   }, []);
 };
-const traverseEntity = async (visitor2, options, entity) => {
+const parallelWithOrderedErrors = async (promises) => {
+  const results = await Promise.allSettled(promises);
+  for (let i = 0; i < results.length; i += 1) {
+    const result = results[i];
+    if (result.status === "rejected") {
+      throw result.reason;
+    }
+  }
+  return results.map((r) => r.value);
+};
+const traverseEntity$1 = async (visitor2, options, entity) => {
   const { path = {
     raw: null,
     attribute: null,
     rawWithIndices: null
-  }, schema: schema2, getModel } = options;
+  }, schema: schema2, getModel, allowedExtraRootKeys } = options;
   let parent = options.parent;
   const traverseMorphRelationTarget = async (visitor3, path2, entry) => {
     const targetSchema = getModel(entry.__type);
@@ -298,18 +313,20 @@ const traverseEntity = async (visitor2, options, entity) => {
       schema: targetSchema,
       path: path2,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
-    return traverseEntity(visitor3, traverseOptions, entry);
+    return traverseEntity$1(visitor3, traverseOptions, entry);
   };
   const traverseRelationTarget = (schema3) => async (visitor3, path2, entry) => {
     const traverseOptions = {
       schema: schema3,
       path: path2,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
-    return traverseEntity(visitor3, traverseOptions, entry);
+    return traverseEntity$1(visitor3, traverseOptions, entry);
   };
   const traverseMediaTarget = async (visitor3, path2, entry) => {
     const targetSchemaUID = "plugin::upload.file";
@@ -318,18 +335,20 @@ const traverseEntity = async (visitor2, options, entity) => {
       schema: targetSchema,
       path: path2,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
-    return traverseEntity(visitor3, traverseOptions, entry);
+    return traverseEntity$1(visitor3, traverseOptions, entry);
   };
   const traverseComponent = async (visitor3, path2, schema3, entry) => {
     const traverseOptions = {
       schema: schema3,
       path: path2,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
-    return traverseEntity(visitor3, traverseOptions, entry);
+    return traverseEntity$1(visitor3, traverseOptions, entry);
   };
   const visitDynamicZoneEntry = async (visitor3, path2, entry) => {
     const targetSchema = getModel(entry.__component);
@@ -337,9 +356,10 @@ const traverseEntity = async (visitor2, options, entity) => {
       schema: targetSchema,
       path: path2,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
-    return traverseEntity(visitor3, traverseOptions, entry);
+    return traverseEntity$1(visitor3, traverseOptions, entry);
   };
   if (!fp.isObject(entity) || fp.isNil(schema2)) {
     return entity;
@@ -368,7 +388,8 @@ const traverseEntity = async (visitor2, options, entity) => {
       attribute,
       path: newPath,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
     await visitor2(visitorOptions, visitorUtils);
     const value = copy[key];
@@ -385,15 +406,13 @@ const traverseEntity = async (visitor2, options, entity) => {
       const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
       const method = isMorphRelation ? traverseMorphRelationTarget : traverseRelationTarget(getModel(attribute.target));
       if (fp.isArray(value)) {
-        const res = new Array(value.length);
-        for (let i2 = 0; i2 < value.length; i2 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i2) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i2}` : `${newPath.rawWithIndices}.${i2}`
           };
-          res[i2] = await method(visitor2, arrayPath, value[i2]);
-        }
-        copy[key] = res;
+          return method(visitor2, arrayPath, item);
+        }));
       } else {
         copy[key] = await method(visitor2, newPath, value);
       }
@@ -407,15 +426,13 @@ const traverseEntity = async (visitor2, options, entity) => {
         path: newPath
       };
       if (fp.isArray(value)) {
-        const res = new Array(value.length);
-        for (let i2 = 0; i2 < value.length; i2 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i2) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i2}` : `${newPath.rawWithIndices}.${i2}`
           };
-          res[i2] = await traverseMediaTarget(visitor2, arrayPath, value[i2]);
-        }
-        copy[key] = res;
+          return traverseMediaTarget(visitor2, arrayPath, item);
+        }));
       } else {
         copy[key] = await traverseMediaTarget(visitor2, newPath, value);
       }
@@ -430,15 +447,13 @@ const traverseEntity = async (visitor2, options, entity) => {
       };
       const targetSchema = getModel(attribute.component);
       if (fp.isArray(value)) {
-        const res = new Array(value.length);
-        for (let i2 = 0; i2 < value.length; i2 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i2) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i2}` : `${newPath.rawWithIndices}.${i2}`
           };
-          res[i2] = await traverseComponent(visitor2, arrayPath, targetSchema, value[i2]);
-        }
-        copy[key] = res;
+          return traverseComponent(visitor2, arrayPath, targetSchema, item);
+        }));
       } else {
         copy[key] = await traverseComponent(visitor2, newPath, targetSchema, value);
       }
@@ -451,15 +466,13 @@ const traverseEntity = async (visitor2, options, entity) => {
         attribute,
         path: newPath
       };
-      const res = new Array(value.length);
-      for (let i2 = 0; i2 < value.length; i2 += 1) {
+      copy[key] = await parallelWithOrderedErrors(value.map((item, i2) => {
         const arrayPath = {
           ...newPath,
           rawWithIndices: fp.isNil(newPath.rawWithIndices) ? `${i2}` : `${newPath.rawWithIndices}.${i2}`
         };
-        res[i2] = await visitDynamicZoneEntry(visitor2, arrayPath, value[i2]);
-      }
-      copy[key] = res;
+        return visitDynamicZoneEntry(visitor2, arrayPath, item);
+      }));
       continue;
     }
   }
@@ -473,7 +486,7 @@ const createVisitorUtils = ({ data }) => ({
     data[key] = value;
   }
 });
-fp.curry(traverseEntity);
+fp.curry(traverseEntity$1);
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -484,7 +497,7 @@ var hasRequiredDist;
 function requireDist() {
   if (hasRequiredDist) return dist$1.exports;
   hasRequiredDist = 1;
-  (function(module2, exports2) {
+  (function(module2, exports$1) {
     !(function(t, n) {
       module2.exports = n(require$$0__default.default, require$$1__default.default);
     })(dist, function(t, n) {
@@ -3496,7 +3509,7 @@ function requireHttpErrors() {
         Object.defineProperty(func, "name", desc);
       }
     }
-    function populateConstructorExports(exports2, codes, HttpError) {
+    function populateConstructorExports(exports$1, codes, HttpError) {
       codes.forEach(function forEachCode(code) {
         var CodeError;
         var name2 = toIdentifier(statuses2.message[code]);
@@ -3509,8 +3522,8 @@ function requireHttpErrors() {
             break;
         }
         if (CodeError) {
-          exports2[code] = CodeError;
-          exports2[name2] = CodeError;
+          exports$1[code] = CodeError;
+          exports$1[name2] = CodeError;
         }
       });
     }
@@ -6885,8 +6898,8 @@ var hasRequiredUtils$1;
 function requireUtils$1() {
   if (hasRequiredUtils$1) return utils$1;
   hasRequiredUtils$1 = 1;
-  (function(exports2) {
-    exports2.isInteger = (num) => {
+  (function(exports$1) {
+    exports$1.isInteger = (num) => {
       if (typeof num === "number") {
         return Number.isInteger(num);
       }
@@ -6895,13 +6908,13 @@ function requireUtils$1() {
       }
       return false;
     };
-    exports2.find = (node, type2) => node.nodes.find((node2) => node2.type === type2);
-    exports2.exceedsLimit = (min, max, step = 1, limit) => {
+    exports$1.find = (node, type2) => node.nodes.find((node2) => node2.type === type2);
+    exports$1.exceedsLimit = (min, max, step = 1, limit) => {
       if (limit === false) return false;
-      if (!exports2.isInteger(min) || !exports2.isInteger(max)) return false;
+      if (!exports$1.isInteger(min) || !exports$1.isInteger(max)) return false;
       return (Number(max) - Number(min)) / Number(step) >= limit;
     };
-    exports2.escapeNode = (block, n = 0, type2) => {
+    exports$1.escapeNode = (block, n = 0, type2) => {
       const node = block.nodes[n];
       if (!node) return;
       if (type2 && node.type === type2 || node.type === "open" || node.type === "close") {
@@ -6911,7 +6924,7 @@ function requireUtils$1() {
         }
       }
     };
-    exports2.encloseBrace = (node) => {
+    exports$1.encloseBrace = (node) => {
       if (node.type !== "brace") return false;
       if (node.commas >> 0 + node.ranges >> 0 === 0) {
         node.invalid = true;
@@ -6919,7 +6932,7 @@ function requireUtils$1() {
       }
       return false;
     };
-    exports2.isInvalidBrace = (block) => {
+    exports$1.isInvalidBrace = (block) => {
       if (block.type !== "brace") return false;
       if (block.invalid === true || block.dollar) return true;
       if (block.commas >> 0 + block.ranges >> 0 === 0) {
@@ -6932,18 +6945,18 @@ function requireUtils$1() {
       }
       return false;
     };
-    exports2.isOpenOrClose = (node) => {
+    exports$1.isOpenOrClose = (node) => {
       if (node.type === "open" || node.type === "close") {
         return true;
       }
       return node.open === true || node.close === true;
     };
-    exports2.reduce = (nodes) => nodes.reduce((acc, node) => {
+    exports$1.reduce = (nodes) => nodes.reduce((acc, node) => {
       if (node.type === "text") acc.push(node.value);
       if (node.type === "range") node.type = "text";
       return acc;
     }, []);
-    exports2.flatten = (...args) => {
+    exports$1.flatten = (...args) => {
       const result = [];
       const flat = (arr) => {
         for (let i = 0; i < arr.length; i++) {
@@ -8166,7 +8179,7 @@ var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils;
   hasRequiredUtils = 1;
-  (function(exports2) {
+  (function(exports$1) {
     const path = require$$0__default$3.default;
     const win32 = process.platform === "win32";
     const {
@@ -8175,36 +8188,36 @@ function requireUtils() {
       REGEX_SPECIAL_CHARS,
       REGEX_SPECIAL_CHARS_GLOBAL
     } = requireConstants();
-    exports2.isObject = (val) => val !== null && typeof val === "object" && !Array.isArray(val);
-    exports2.hasRegexChars = (str2) => REGEX_SPECIAL_CHARS.test(str2);
-    exports2.isRegexChar = (str2) => str2.length === 1 && exports2.hasRegexChars(str2);
-    exports2.escapeRegex = (str2) => str2.replace(REGEX_SPECIAL_CHARS_GLOBAL, "\\$1");
-    exports2.toPosixSlashes = (str2) => str2.replace(REGEX_BACKSLASH, "/");
-    exports2.removeBackslashes = (str2) => {
+    exports$1.isObject = (val) => val !== null && typeof val === "object" && !Array.isArray(val);
+    exports$1.hasRegexChars = (str2) => REGEX_SPECIAL_CHARS.test(str2);
+    exports$1.isRegexChar = (str2) => str2.length === 1 && exports$1.hasRegexChars(str2);
+    exports$1.escapeRegex = (str2) => str2.replace(REGEX_SPECIAL_CHARS_GLOBAL, "\\$1");
+    exports$1.toPosixSlashes = (str2) => str2.replace(REGEX_BACKSLASH, "/");
+    exports$1.removeBackslashes = (str2) => {
       return str2.replace(REGEX_REMOVE_BACKSLASH, (match) => {
         return match === "\\" ? "" : match;
       });
     };
-    exports2.supportsLookbehinds = () => {
+    exports$1.supportsLookbehinds = () => {
       const segs = process.version.slice(1).split(".").map(Number);
       if (segs.length === 3 && segs[0] >= 9 || segs[0] === 8 && segs[1] >= 10) {
         return true;
       }
       return false;
     };
-    exports2.isWindows = (options) => {
+    exports$1.isWindows = (options) => {
       if (options && typeof options.windows === "boolean") {
         return options.windows;
       }
       return win32 === true || path.sep === "\\";
     };
-    exports2.escapeLast = (input, char, lastIdx) => {
+    exports$1.escapeLast = (input, char, lastIdx) => {
       const idx = input.lastIndexOf(char, lastIdx);
       if (idx === -1) return input;
-      if (input[idx - 1] === "\\") return exports2.escapeLast(input, char, idx - 1);
+      if (input[idx - 1] === "\\") return exports$1.escapeLast(input, char, idx - 1);
       return `${input.slice(0, idx)}\\${input.slice(idx)}`;
     };
-    exports2.removePrefix = (input, state = {}) => {
+    exports$1.removePrefix = (input, state = {}) => {
       let output = input;
       if (output.startsWith("./")) {
         output = output.slice(2);
@@ -8212,7 +8225,7 @@ function requireUtils() {
       }
       return output;
     };
-    exports2.wrapOutput = (input, state = {}, options = {}) => {
+    exports$1.wrapOutput = (input, state = {}, options = {}) => {
       const prepend = options.contains ? "" : "^";
       const append = options.contains ? "" : "$";
       let output = `${prepend}(?:${input})${append}`;
@@ -13856,7 +13869,14 @@ function requirePreferredPm() {
       };
     }
     try {
-      if (typeof findYarnWorkspaceRoot(pkgPath) === "string") {
+      const workspaceRoot = findYarnWorkspaceRoot(pkgPath);
+      if (typeof workspaceRoot === "string") {
+        if (await pathExists2(path.join(workspaceRoot, "package-lock.json"))) {
+          return {
+            name: "npm",
+            version: ">=7"
+          };
+        }
         return {
           name: "yarn",
           version: "*"
@@ -18430,7 +18450,7 @@ function asBoolean(value) {
   const normalized = value.toLowerCase().trim();
   return normalized !== "false" && normalized !== "0";
 }
-const version = "1.15.0";
+const version = "1.16.0-beta.0";
 const name = "@fourlights/strapi-plugin-deep-populate";
 const f = (msg, context = void 0) => {
   const prefix = `[${name}] `;
@@ -18624,10 +18644,8 @@ const getConfig = (params) => {
     localizations: localizationsFallback,
     contentTypes: contentTypes2
   } = strapi.config.get("plugin::deep-populate");
-  const contentTypeConfig = ___default.has(contentTypes2, "*") ? ___default.get(contentTypes2, "*") : {};
-  if (___default.has(contentTypes2, params.contentType)) {
-    ___default.mergeWith(contentTypeConfig, sanitizeObject(___default.get(contentTypes2, params.contentType)));
-  }
+  const baseConfig = ___default.has(contentTypes2, "*") ? ___default.get(contentTypes2, "*") : {};
+  const contentTypeConfig = ___default.has(contentTypes2, params.contentType) ? ___default.mergeWith({}, baseConfig, sanitizeObject(___default.get(contentTypes2, params.contentType))) : baseConfig;
   const { allow, deny } = contentTypeConfig;
   const omitEmpty = params.omitEmpty ?? contentTypeConfig.omitEmpty ?? omitEmptyFallback;
   const localizations = params.localizations ?? contentTypeConfig.localizations ?? localizationsFallback;
@@ -18975,8 +18993,8 @@ async function populate$1(params) {
     resolvedSchemas,
     omitEmpty: config2.omitEmpty,
     localizations: config2.localizations,
-    __deny: config2.deny,
-    __allow: config2.allow,
+    __deny: clone__default.default(config2.deny),
+    __allow: clone__default.default(config2.allow),
     ...params
   });
   populated.__deepPopulated = true;

package/dist/server/index.mjs

@@ -1,7 +1,7 @@
 import isEmpty$1 from "lodash/isEmpty";
 import isObject$2 from "lodash/isObject";
 import ___default, { isNil as isNil$1, has as has$1, get as get$1, mergeWith } from "lodash";
-import { union as union$1, getOr, curry, isObject as isObject$3, isNil, clone as clone$2, isArray, pick as pick$1, isEmpty as isEmpty$2, cloneDeep, omit as omit$1, isString, trim as trim$1, pipe as pipe$2, split, map as map$3, flatten, first, constant, identity, join, eq, get } from "lodash/fp";
+import { union as union$1, getOr, curry, isObject as isObject$3, isNil, clone as clone$2, isArray, pick as pick$1, isEmpty as isEmpty$2, cloneDeep, omit as omit$1, trim as trim$1, isString, pipe as pipe$2, split, map as map$3, flatten, first, identity, constant, join, eq, get } from "lodash/fp";
 import require$$1 from "crypto";
 import require$$0$1 from "child_process";
 import has from "lodash/has";
@@ -23,6 +23,7 @@ import cloneDeep$1 from "lodash/cloneDeep";
 import unset from "lodash/unset";
 import get$2 from "lodash/get";
 import isEqual from "lodash/isEqual";
+import clone$3 from "lodash/clone";
 import merge$2 from "lodash/merge";
 import mergeWith$1 from "lodash/mergeWith";
 import set$2 from "lodash/set";
@@ -132,73 +133,76 @@ function envFn(key, defaultValue) {
 function getKey(key) {
   return process.env[key] ?? "";
 }
-const utils$2 = {
-  int(key, defaultValue) {
-    if (!___default.has(process.env, key)) {
-      return defaultValue;
-    }
-    return parseInt(getKey(key), 10);
-  },
-  float(key, defaultValue) {
-    if (!___default.has(process.env, key)) {
-      return defaultValue;
-    }
-    return parseFloat(getKey(key));
-  },
-  bool(key, defaultValue) {
-    if (!___default.has(process.env, key)) {
-      return defaultValue;
-    }
-    return getKey(key) === "true";
-  },
-  json(key, defaultValue) {
-    if (!___default.has(process.env, key)) {
-      return defaultValue;
-    }
-    try {
-      return JSON.parse(getKey(key));
-    } catch (error2) {
-      if (error2 instanceof Error) {
-        throw new Error(`Invalid json environment variable ${key}: ${error2.message}`);
-      }
-      throw error2;
-    }
-  },
-  array(key, defaultValue) {
-    if (!___default.has(process.env, key)) {
-      return defaultValue;
-    }
-    let value = getKey(key);
-    if (value.startsWith("[") && value.endsWith("]")) {
-      value = value.substring(1, value.length - 1);
-    }
-    return value.split(",").map((v) => {
-      return ___default.trim(___default.trim(v, " "), '"');
-    });
-  },
-  date(key, defaultValue) {
-    if (!___default.has(process.env, key)) {
-      return defaultValue;
-    }
-    return new Date(getKey(key));
-  },
-  /**
-  * Gets a value from env that matches oneOf provided values
-  * @param {string} key
-  * @param {string[]} expectedValues
-  * @param {string|undefined} defaultValue
-  * @returns {string|undefined}
-  */
-  oneOf(key, expectedValues, defaultValue) {
-    if (!expectedValues) {
-      throw new Error(`env.oneOf requires expectedValues`);
-    }
-    if (defaultValue && !expectedValues.includes(defaultValue)) {
-      throw new Error(`env.oneOf requires defaultValue to be included in expectedValues`);
+function int$2(key, defaultValue) {
+  if (!___default.has(process.env, key)) {
+    return defaultValue;
+  }
+  return parseInt(getKey(key), 10);
+}
+function float$1(key, defaultValue) {
+  if (!___default.has(process.env, key)) {
+    return defaultValue;
+  }
+  return parseFloat(getKey(key));
+}
+function bool$1(key, defaultValue) {
+  if (!___default.has(process.env, key)) {
+    return defaultValue;
+  }
+  return getKey(key) === "true";
+}
+function json$1(key, defaultValue) {
+  if (!___default.has(process.env, key)) {
+    return defaultValue;
+  }
+  try {
+    return JSON.parse(getKey(key));
+  } catch (error2) {
+    if (error2 instanceof Error) {
+      throw new Error(`Invalid json environment variable ${key}: ${error2.message}`);
     }
-    const rawValue = env(key, defaultValue);
-    return expectedValues.includes(rawValue) ? rawValue : defaultValue;
+    throw error2;
   }
+}
+function array$2(key, defaultValue) {
+  if (!___default.has(process.env, key)) {
+    return defaultValue;
+  }
+  let value = getKey(key);
+  if (value.startsWith("[") && value.endsWith("]")) {
+    value = value.substring(1, value.length - 1);
+  }
+  return value.split(",").map((v) => {
+    return ___default.trim(___default.trim(v, " "), '"');
+  });
+}
+function date$3(key, defaultValue) {
+  if (!___default.has(process.env, key)) {
+    return defaultValue;
+  }
+  return new Date(getKey(key));
+}
+function oneOf(key, expectedValues, defaultValue) {
+  if (!expectedValues) {
+    throw new Error(`env.oneOf requires expectedValues`);
+  }
+  if (defaultValue && !expectedValues.includes(defaultValue)) {
+    throw new Error(`env.oneOf requires defaultValue to be included in expectedValues`);
+  }
+  const rawValue = env(key, defaultValue);
+  if (rawValue !== void 0 && expectedValues.includes(rawValue)) {
+    return rawValue;
+  }
+  return defaultValue;
+}
+const utils$2 = {
+  int: int$2,
+  float: float$1,
+  bool: bool$1,
+  json: json$1,
+  array: array$2,
+  date: date$3,
+  oneOf
 };
 const env = Object.assign(envFn, utils$2);
 const ID_ATTRIBUTE$1 = "id";
@@ -237,10 +241,10 @@ const HAS_RELATION_REORDERING = [
   "oneToMany"
 ];
 const hasRelationReordering = (attribute) => isRelationalAttribute(attribute) && HAS_RELATION_REORDERING.includes(attribute.relation);
-const isComponentAttribute = (attribute) => [
+const isComponentAttribute = (attribute) => !!attribute && [
   "component",
   "dynamiczone"
-].includes(attribute?.type);
+].includes(attribute.type);
 const isDynamicZoneAttribute = (attribute) => !!attribute && attribute.type === "dynamiczone";
 const isMorphToRelationalAttribute = (attribute) => {
   return !!attribute && isRelationalAttribute(attribute) && attribute.relation?.startsWith?.("morphTo");
@@ -257,12 +261,22 @@ const getRelationalAttributes = (schema2) => {
     return acc;
   }, []);
 };
-const traverseEntity = async (visitor2, options, entity) => {
+const parallelWithOrderedErrors = async (promises) => {
+  const results = await Promise.allSettled(promises);
+  for (let i = 0; i < results.length; i += 1) {
+    const result = results[i];
+    if (result.status === "rejected") {
+      throw result.reason;
+    }
+  }
+  return results.map((r) => r.value);
+};
+const traverseEntity$1 = async (visitor2, options, entity) => {
   const { path = {
     raw: null,
     attribute: null,
     rawWithIndices: null
-  }, schema: schema2, getModel } = options;
+  }, schema: schema2, getModel, allowedExtraRootKeys } = options;
   let parent = options.parent;
   const traverseMorphRelationTarget = async (visitor3, path2, entry) => {
     const targetSchema = getModel(entry.__type);
@@ -270,18 +284,20 @@ const traverseEntity = async (visitor2, options, entity) => {
       schema: targetSchema,
       path: path2,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
-    return traverseEntity(visitor3, traverseOptions, entry);
+    return traverseEntity$1(visitor3, traverseOptions, entry);
   };
   const traverseRelationTarget = (schema3) => async (visitor3, path2, entry) => {
     const traverseOptions = {
       schema: schema3,
       path: path2,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
-    return traverseEntity(visitor3, traverseOptions, entry);
+    return traverseEntity$1(visitor3, traverseOptions, entry);
   };
   const traverseMediaTarget = async (visitor3, path2, entry) => {
     const targetSchemaUID = "plugin::upload.file";
@@ -290,18 +306,20 @@ const traverseEntity = async (visitor2, options, entity) => {
       schema: targetSchema,
       path: path2,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
-    return traverseEntity(visitor3, traverseOptions, entry);
+    return traverseEntity$1(visitor3, traverseOptions, entry);
   };
   const traverseComponent = async (visitor3, path2, schema3, entry) => {
     const traverseOptions = {
       schema: schema3,
       path: path2,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
-    return traverseEntity(visitor3, traverseOptions, entry);
+    return traverseEntity$1(visitor3, traverseOptions, entry);
   };
   const visitDynamicZoneEntry = async (visitor3, path2, entry) => {
     const targetSchema = getModel(entry.__component);
@@ -309,9 +327,10 @@ const traverseEntity = async (visitor2, options, entity) => {
       schema: targetSchema,
       path: path2,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
-    return traverseEntity(visitor3, traverseOptions, entry);
+    return traverseEntity$1(visitor3, traverseOptions, entry);
   };
   if (!isObject$3(entity) || isNil(schema2)) {
     return entity;
@@ -340,7 +359,8 @@ const traverseEntity = async (visitor2, options, entity) => {
       attribute,
       path: newPath,
       getModel,
-      parent
+      parent,
+      allowedExtraRootKeys
     };
     await visitor2(visitorOptions, visitorUtils);
     const value = copy[key];
@@ -357,15 +377,13 @@ const traverseEntity = async (visitor2, options, entity) => {
       const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
       const method = isMorphRelation ? traverseMorphRelationTarget : traverseRelationTarget(getModel(attribute.target));
       if (isArray(value)) {
-        const res = new Array(value.length);
-        for (let i2 = 0; i2 < value.length; i2 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i2) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: isNil(newPath.rawWithIndices) ? `${i2}` : `${newPath.rawWithIndices}.${i2}`
           };
-          res[i2] = await method(visitor2, arrayPath, value[i2]);
-        }
-        copy[key] = res;
+          return method(visitor2, arrayPath, item);
+        }));
       } else {
         copy[key] = await method(visitor2, newPath, value);
       }
@@ -379,15 +397,13 @@ const traverseEntity = async (visitor2, options, entity) => {
         path: newPath
       };
       if (isArray(value)) {
-        const res = new Array(value.length);
-        for (let i2 = 0; i2 < value.length; i2 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i2) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: isNil(newPath.rawWithIndices) ? `${i2}` : `${newPath.rawWithIndices}.${i2}`
           };
-          res[i2] = await traverseMediaTarget(visitor2, arrayPath, value[i2]);
-        }
-        copy[key] = res;
+          return traverseMediaTarget(visitor2, arrayPath, item);
+        }));
       } else {
         copy[key] = await traverseMediaTarget(visitor2, newPath, value);
       }
@@ -402,15 +418,13 @@ const traverseEntity = async (visitor2, options, entity) => {
       };
       const targetSchema = getModel(attribute.component);
       if (isArray(value)) {
-        const res = new Array(value.length);
-        for (let i2 = 0; i2 < value.length; i2 += 1) {
+        copy[key] = await parallelWithOrderedErrors(value.map((item, i2) => {
           const arrayPath = {
             ...newPath,
             rawWithIndices: isNil(newPath.rawWithIndices) ? `${i2}` : `${newPath.rawWithIndices}.${i2}`
           };
-          res[i2] = await traverseComponent(visitor2, arrayPath, targetSchema, value[i2]);
-        }
-        copy[key] = res;
+          return traverseComponent(visitor2, arrayPath, targetSchema, item);
+        }));
       } else {
         copy[key] = await traverseComponent(visitor2, newPath, targetSchema, value);
       }
@@ -423,15 +437,13 @@ const traverseEntity = async (visitor2, options, entity) => {
         attribute,
         path: newPath
       };
-      const res = new Array(value.length);
-      for (let i2 = 0; i2 < value.length; i2 += 1) {
+      copy[key] = await parallelWithOrderedErrors(value.map((item, i2) => {
         const arrayPath = {
           ...newPath,
           rawWithIndices: isNil(newPath.rawWithIndices) ? `${i2}` : `${newPath.rawWithIndices}.${i2}`
         };
-        res[i2] = await visitDynamicZoneEntry(visitor2, arrayPath, value[i2]);
-      }
-      copy[key] = res;
+        return visitDynamicZoneEntry(visitor2, arrayPath, item);
+      }));
       continue;
     }
   }
@@ -445,7 +457,7 @@ const createVisitorUtils = ({ data }) => ({
     data[key] = value;
   }
 });
-curry(traverseEntity);
+curry(traverseEntity$1);
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -456,7 +468,7 @@ var hasRequiredDist;
 function requireDist() {
   if (hasRequiredDist) return dist$1.exports;
   hasRequiredDist = 1;
-  (function(module, exports) {
+  (function(module, exports$1) {
     !(function(t, n) {
       module.exports = n(require$$0$1, require$$1);
     })(dist, function(t, n) {
@@ -3468,7 +3480,7 @@ function requireHttpErrors() {
         Object.defineProperty(func, "name", desc);
       }
     }
-    function populateConstructorExports(exports, codes, HttpError) {
+    function populateConstructorExports(exports$1, codes, HttpError) {
       codes.forEach(function forEachCode(code) {
         var CodeError;
         var name2 = toIdentifier(statuses2.message[code]);
@@ -3481,8 +3493,8 @@ function requireHttpErrors() {
             break;
         }
         if (CodeError) {
-          exports[code] = CodeError;
-          exports[name2] = CodeError;
+          exports$1[code] = CodeError;
+          exports$1[name2] = CodeError;
         }
       });
     }
@@ -6857,8 +6869,8 @@ var hasRequiredUtils$1;
 function requireUtils$1() {
   if (hasRequiredUtils$1) return utils$1;
   hasRequiredUtils$1 = 1;
-  (function(exports) {
-    exports.isInteger = (num) => {
+  (function(exports$1) {
+    exports$1.isInteger = (num) => {
       if (typeof num === "number") {
         return Number.isInteger(num);
       }
@@ -6867,13 +6879,13 @@ function requireUtils$1() {
       }
       return false;
     };
-    exports.find = (node, type2) => node.nodes.find((node2) => node2.type === type2);
-    exports.exceedsLimit = (min, max, step = 1, limit) => {
+    exports$1.find = (node, type2) => node.nodes.find((node2) => node2.type === type2);
+    exports$1.exceedsLimit = (min, max, step = 1, limit) => {
       if (limit === false) return false;
-      if (!exports.isInteger(min) || !exports.isInteger(max)) return false;
+      if (!exports$1.isInteger(min) || !exports$1.isInteger(max)) return false;
       return (Number(max) - Number(min)) / Number(step) >= limit;
     };
-    exports.escapeNode = (block, n = 0, type2) => {
+    exports$1.escapeNode = (block, n = 0, type2) => {
       const node = block.nodes[n];
       if (!node) return;
       if (type2 && node.type === type2 || node.type === "open" || node.type === "close") {
@@ -6883,7 +6895,7 @@ function requireUtils$1() {
         }
       }
     };
-    exports.encloseBrace = (node) => {
+    exports$1.encloseBrace = (node) => {
       if (node.type !== "brace") return false;
       if (node.commas >> 0 + node.ranges >> 0 === 0) {
         node.invalid = true;
@@ -6891,7 +6903,7 @@ function requireUtils$1() {
       }
       return false;
     };
-    exports.isInvalidBrace = (block) => {
+    exports$1.isInvalidBrace = (block) => {
       if (block.type !== "brace") return false;
       if (block.invalid === true || block.dollar) return true;
       if (block.commas >> 0 + block.ranges >> 0 === 0) {
@@ -6904,18 +6916,18 @@ function requireUtils$1() {
       }
       return false;
     };
-    exports.isOpenOrClose = (node) => {
+    exports$1.isOpenOrClose = (node) => {
       if (node.type === "open" || node.type === "close") {
         return true;
       }
       return node.open === true || node.close === true;
     };
-    exports.reduce = (nodes) => nodes.reduce((acc, node) => {
+    exports$1.reduce = (nodes) => nodes.reduce((acc, node) => {
       if (node.type === "text") acc.push(node.value);
       if (node.type === "range") node.type = "text";
       return acc;
     }, []);
-    exports.flatten = (...args) => {
+    exports$1.flatten = (...args) => {
       const result = [];
       const flat = (arr) => {
         for (let i = 0; i < arr.length; i++) {
@@ -8138,7 +8150,7 @@ var hasRequiredUtils;
 function requireUtils() {
   if (hasRequiredUtils) return utils;
   hasRequiredUtils = 1;
-  (function(exports) {
+  (function(exports$1) {
     const path = require$$0$4;
     const win32 = process.platform === "win32";
     const {
@@ -8147,36 +8159,36 @@ function requireUtils() {
       REGEX_SPECIAL_CHARS,
       REGEX_SPECIAL_CHARS_GLOBAL
     } = requireConstants();
-    exports.isObject = (val) => val !== null && typeof val === "object" && !Array.isArray(val);
-    exports.hasRegexChars = (str2) => REGEX_SPECIAL_CHARS.test(str2);
-    exports.isRegexChar = (str2) => str2.length === 1 && exports.hasRegexChars(str2);
-    exports.escapeRegex = (str2) => str2.replace(REGEX_SPECIAL_CHARS_GLOBAL, "\\$1");
-    exports.toPosixSlashes = (str2) => str2.replace(REGEX_BACKSLASH, "/");
-    exports.removeBackslashes = (str2) => {
+    exports$1.isObject = (val) => val !== null && typeof val === "object" && !Array.isArray(val);
+    exports$1.hasRegexChars = (str2) => REGEX_SPECIAL_CHARS.test(str2);
+    exports$1.isRegexChar = (str2) => str2.length === 1 && exports$1.hasRegexChars(str2);
+    exports$1.escapeRegex = (str2) => str2.replace(REGEX_SPECIAL_CHARS_GLOBAL, "\\$1");
+    exports$1.toPosixSlashes = (str2) => str2.replace(REGEX_BACKSLASH, "/");
+    exports$1.removeBackslashes = (str2) => {
       return str2.replace(REGEX_REMOVE_BACKSLASH, (match) => {
         return match === "\\" ? "" : match;
       });
     };
-    exports.supportsLookbehinds = () => {
+    exports$1.supportsLookbehinds = () => {
       const segs = process.version.slice(1).split(".").map(Number);
       if (segs.length === 3 && segs[0] >= 9 || segs[0] === 8 && segs[1] >= 10) {
         return true;
       }
       return false;
     };
-    exports.isWindows = (options) => {
+    exports$1.isWindows = (options) => {
       if (options && typeof options.windows === "boolean") {
         return options.windows;
       }
       return win32 === true || path.sep === "\\";
     };
-    exports.escapeLast = (input, char, lastIdx) => {
+    exports$1.escapeLast = (input, char, lastIdx) => {
       const idx = input.lastIndexOf(char, lastIdx);
       if (idx === -1) return input;
-      if (input[idx - 1] === "\\") return exports.escapeLast(input, char, idx - 1);
+      if (input[idx - 1] === "\\") return exports$1.escapeLast(input, char, idx - 1);
       return `${input.slice(0, idx)}\\${input.slice(idx)}`;
     };
-    exports.removePrefix = (input, state = {}) => {
+    exports$1.removePrefix = (input, state = {}) => {
       let output = input;
       if (output.startsWith("./")) {
         output = output.slice(2);
@@ -8184,7 +8196,7 @@ function requireUtils() {
       }
       return output;
     };
-    exports.wrapOutput = (input, state = {}, options = {}) => {
+    exports$1.wrapOutput = (input, state = {}, options = {}) => {
       const prepend = options.contains ? "" : "^";
       const append = options.contains ? "" : "$";
       let output = `${prepend}(?:${input})${append}`;
@@ -13828,7 +13840,14 @@ function requirePreferredPm() {
       };
     }
     try {
-      if (typeof findYarnWorkspaceRoot(pkgPath) === "string") {
+      const workspaceRoot = findYarnWorkspaceRoot(pkgPath);
+      if (typeof workspaceRoot === "string") {
+        if (await pathExists2(path.join(workspaceRoot, "package-lock.json"))) {
+          return {
+            name: "npm",
+            version: ">=7"
+          };
+        }
         return {
           name: "yarn",
           version: "*"
@@ -18402,7 +18421,7 @@ function asBoolean(value) {
   const normalized = value.toLowerCase().trim();
   return normalized !== "false" && normalized !== "0";
 }
-const version = "1.15.0";
+const version = "1.16.0-beta.0";
 const name = "@fourlights/strapi-plugin-deep-populate";
 const f = (msg, context = void 0) => {
   const prefix = `[${name}] `;
@@ -18596,10 +18615,8 @@ const getConfig = (params) => {
     localizations: localizationsFallback,
     contentTypes: contentTypes2
   } = strapi.config.get("plugin::deep-populate");
-  const contentTypeConfig = has$1(contentTypes2, "*") ? get$1(contentTypes2, "*") : {};
-  if (has$1(contentTypes2, params.contentType)) {
-    mergeWith(contentTypeConfig, sanitizeObject(get$1(contentTypes2, params.contentType)));
-  }
+  const baseConfig = has$1(contentTypes2, "*") ? get$1(contentTypes2, "*") : {};
+  const contentTypeConfig = has$1(contentTypes2, params.contentType) ? mergeWith({}, baseConfig, sanitizeObject(get$1(contentTypes2, params.contentType))) : baseConfig;
   const { allow, deny } = contentTypeConfig;
   const omitEmpty = params.omitEmpty ?? contentTypeConfig.omitEmpty ?? omitEmptyFallback;
   const localizations = params.localizations ?? contentTypeConfig.localizations ?? localizationsFallback;
@@ -18947,8 +18964,8 @@ async function populate$1(params) {
     resolvedSchemas,
     omitEmpty: config2.omitEmpty,
     localizations: config2.localizations,
-    __deny: config2.deny,
-    __allow: config2.allow,
+    __deny: clone$3(config2.deny),
+    __allow: clone$3(config2.allow),
     ...params
   });
   populated.__deepPopulated = true;

package/dist/server/src/services/deep-populate/utils.d.ts

@@ -4,8 +4,8 @@ export declare const getRelations: <TSchema extends UID.Schema>(model: Schema.Sc
 export declare const isEmpty: (obj: object) => boolean;
 export declare const hasValue: (value: unknown) => boolean;
 export declare const getConfig: (params: PopulateParams) => {
-    allow: import("../../config").ContentTypeConfigAllow;
-    deny: import("../../config").ContentTypeConfigDeny;
-    omitEmpty: boolean;
-    localizations: boolean;
+    allow: any;
+    deny: any;
+    omitEmpty: any;
+    localizations: any;
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.15.0",
+  "version": "1.16.0-beta.0",
   "keywords": [
     "strapi",
     "strapi-plugin",