@fourlights/strapi-plugin-deep-populate 1.14.0 → 1.15.0-rc.1

package/dist/server/index.js

@@ -632,9 +632,9 @@ function requireDist() {
         t2.exports = "constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",");
       }, function(t2, n2, r) {
         var e = r(2), o = r(6), i = r(7), c = r(5), u = "prototype", s = function(t3, n3, r2) {
-          var f, a, p, l = t3 & s.F, v = t3 & s.G, h = t3 & s.S, d = t3 & s.P, y = t3 & s.B, _ = t3 & s.W, x = v ? o : o[n3] || (o[n3] = {}), m = x[u], w = v ? e : h ? e[n3] : (e[n3] || {})[u];
+          var f2, a, p, l = t3 & s.F, v = t3 & s.G, h = t3 & s.S, d = t3 & s.P, y = t3 & s.B, _ = t3 & s.W, x = v ? o : o[n3] || (o[n3] = {}), m = x[u], w = v ? e : h ? e[n3] : (e[n3] || {})[u];
           v && (r2 = n3);
-          for (f in r2) a = !l && w && void 0 !== w[f], a && f in x || (p = a ? w[f] : r2[f], x[f] = v && "function" != typeof w[f] ? r2[f] : y && a ? i(p, e) : _ && w[f] == p ? (function(t4) {
+          for (f2 in r2) a = !l && w && void 0 !== w[f2], a && f2 in x || (p = a ? w[f2] : r2[f2], x[f2] = v && "function" != typeof w[f2] ? r2[f2] : y && a ? i(p, e) : _ && w[f2] == p ? (function(t4) {
             var n4 = function(n5, r3, e2) {
               if (this instanceof t4) {
                 switch (arguments.length) {
@@ -650,7 +650,7 @@ function requireDist() {
               return t4.apply(this, arguments);
             };
             return n4[u] = t4[u], n4;
-          })(p) : d && "function" == typeof p ? i(Function.call, p) : p, d && ((x.virtual || (x.virtual = {}))[f] = p, t3 & s.R && m && !m[f] && c(m, f, p)));
+          })(p) : d && "function" == typeof p ? i(Function.call, p) : p, d && ((x.virtual || (x.virtual = {}))[f2] = p, t3 & s.R && m && !m[f2] && c(m, f2, p)));
         };
         s.F = 1, s.G = 2, s.S = 4, s.P = 8, s.B = 16, s.W = 32, s.U = 64, s.R = 128, t2.exports = s;
       }, function(t2, n2) {
@@ -670,11 +670,11 @@ function requireDist() {
           } }).a;
         });
       }, function(t2, n2, r) {
-        var e = r(28), o = r(23), i = r(57), c = r(5), u = r(8), s = r(10), f = r(45), a = r(18), p = r(52), l = r(1)("iterator"), v = !([].keys && "next" in [].keys()), h = "@@iterator", d = "keys", y = "values", _ = function() {
+        var e = r(28), o = r(23), i = r(57), c = r(5), u = r(8), s = r(10), f2 = r(45), a = r(18), p = r(52), l = r(1)("iterator"), v = !([].keys && "next" in [].keys()), h = "@@iterator", d = "keys", y = "values", _ = function() {
           return this;
         };
         t2.exports = function(t3, n3, r2, x, m, w, g) {
-          f(r2, n3, x);
+          f2(r2, n3, x);
           var b, O, j, S = function(t4) {
             if (!v && t4 in T) return T[t4];
             switch (t4) {
@@ -705,7 +705,7 @@ function requireDist() {
           return i[t3] || (i[t3] = {});
         };
       }, function(t2, n2, r) {
-        var e, o, i, c = r(7), u = r(41), s = r(25), f = r(16), a = r(2), p = a.process, l = a.setImmediate, v = a.clearImmediate, h = a.MessageChannel, d = 0, y = {}, _ = "onreadystatechange", x = function() {
+        var e, o, i, c = r(7), u = r(41), s = r(25), f2 = r(16), a = r(2), p = a.process, l = a.setImmediate, v = a.clearImmediate, h = a.MessageChannel, d = 0, y = {}, _ = "onreadystatechange", x = function() {
           var t3 = +this;
           if (y.hasOwnProperty(t3)) {
             var n3 = y[t3];
@@ -725,8 +725,8 @@ function requireDist() {
           p.nextTick(c(x, t3, 1));
         } : h ? (o = new h(), i = o.port2, o.port1.onmessage = m, e = c(i.postMessage, i, 1)) : a.addEventListener && "function" == typeof postMessage && !a.importScripts ? (e = function(t3) {
           a.postMessage(t3 + "", "*");
-        }, a.addEventListener("message", m, false)) : e = _ in f("script") ? function(t3) {
-          s.appendChild(f("script"))[_] = function() {
+        }, a.addEventListener("message", m, false)) : e = _ in f2("script") ? function(t3) {
+          s.appendChild(f2("script"))[_] = function() {
             s.removeChild(this), x.call(t3);
           };
         } : function(t3) {
@@ -790,7 +790,7 @@ function requireDist() {
           });
         }
         Object.defineProperty(n2, "__esModule", { value: true });
-        var f = r(35), a = e(f);
+        var f2 = r(35), a = e(f2);
         n2.machineIdSync = u, n2.machineId = s;
         var p = r(70), l = r(71), v = process, h = v.platform, d = { native: "%windir%\\System32", mixed: "%windir%\\sysnative\\cmd.exe /c %windir%\\System32" }, y = { darwin: "ioreg -rd1 -c IOPlatformExpertDevice", win32: d[o()] + "\\REG.exe QUERY HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography /v MachineGuid", linux: "( cat /var/lib/dbus/machine-id /etc/machine-id 2> /dev/null || hostname ) | head -n 1 || :", freebsd: "kenv -q smbios.system.uuid || sysctl -n kern.hostuuid" };
       }, function(t2, n2, r) {
@@ -809,24 +809,24 @@ function requireDist() {
         var e = r(13), o = r(31), i = r(62);
         t2.exports = function(t3) {
           return function(n3, r2, c) {
-            var u, s = e(n3), f = o(s.length), a = i(c, f);
+            var u, s = e(n3), f2 = o(s.length), a = i(c, f2);
             if (t3 && r2 != r2) {
-              for (; f > a; ) if (u = s[a++], u != u) return true;
-            } else for (; f > a; a++) if ((t3 || a in s) && s[a] === r2) return t3 || a || 0;
+              for (; f2 > a; ) if (u = s[a++], u != u) return true;
+            } else for (; f2 > a; a++) if ((t3 || a in s) && s[a] === r2) return t3 || a || 0;
             return !t3 && -1;
           };
         };
       }, function(t2, n2, r) {
-        var e = r(7), o = r(44), i = r(43), c = r(3), u = r(31), s = r(64), f = {}, a = {}, n2 = t2.exports = function(t3, n3, r2, p, l) {
+        var e = r(7), o = r(44), i = r(43), c = r(3), u = r(31), s = r(64), f2 = {}, a = {}, n2 = t2.exports = function(t3, n3, r2, p, l) {
           var v, h, d, y, _ = l ? function() {
             return t3;
           } : s(t3), x = e(r2, p, n3 ? 2 : 1), m = 0;
           if ("function" != typeof _) throw TypeError(t3 + " is not iterable!");
           if (i(_)) {
-            for (v = u(t3.length); v > m; m++) if (y = n3 ? x(c(h = t3[m])[0], h[1]) : x(t3[m]), y === f || y === a) return y;
-          } else for (d = _.call(t3); !(h = d.next()).done; ) if (y = o(d, x, h.value, n3), y === f || y === a) return y;
+            for (v = u(t3.length); v > m; m++) if (y = n3 ? x(c(h = t3[m])[0], h[1]) : x(t3[m]), y === f2 || y === a) return y;
+          } else for (d = _.call(t3); !(h = d.next()).done; ) if (y = o(d, x, h.value, n3), y === f2 || y === a) return y;
         };
-        n2.BREAK = f, n2.RETURN = a;
+        n2.BREAK = f2, n2.RETURN = a;
       }, function(t2, n2) {
         t2.exports = function(t3, n3, r) {
           var e = void 0 === r;
@@ -903,7 +903,7 @@ function requireDist() {
       }, function(t2, n2, r) {
         var e = r(2), o = r(30).set, i = e.MutationObserver || e.WebKitMutationObserver, c = e.process, u = e.Promise, s = "process" == r(11)(c);
         t2.exports = function() {
-          var t3, n3, r2, f = function() {
+          var t3, n3, r2, f2 = function() {
             var e2, o2;
             for (s && (e2 = c.domain) && e2.exit(); t3; ) {
               o2 = t3.fn, t3 = t3.next;
@@ -916,20 +916,20 @@ function requireDist() {
             n3 = void 0, e2 && e2.enter();
           };
           if (s) r2 = function() {
-            c.nextTick(f);
+            c.nextTick(f2);
           };
           else if (i) {
             var a = true, p = document.createTextNode("");
-            new i(f).observe(p, { characterData: true }), r2 = function() {
+            new i(f2).observe(p, { characterData: true }), r2 = function() {
               p.data = a = !a;
             };
           } else if (u && u.resolve) {
             var l = u.resolve();
             r2 = function() {
-              l.then(f);
+              l.then(f2);
             };
           } else r2 = function() {
-            o.call(e, f);
+            o.call(e, f2);
           };
           return function(e2) {
             var o2 = { fn: e2, next: void 0 };
@@ -938,14 +938,14 @@ function requireDist() {
         };
       }, function(t2, n2, r) {
         var e = r(3), o = r(50), i = r(22), c = r(19)("IE_PROTO"), u = function() {
-        }, s = "prototype", f = function() {
+        }, s = "prototype", f2 = function() {
           var t3, n3 = r(16)("iframe"), e2 = i.length, o2 = ">";
-          for (n3.style.display = "none", r(25).appendChild(n3), n3.src = "javascript:", t3 = n3.contentWindow.document, t3.open(), t3.write("<script>document.F=Object<\/script" + o2), t3.close(), f = t3.F; e2--; ) delete f[s][i[e2]];
-          return f();
+          for (n3.style.display = "none", r(25).appendChild(n3), n3.src = "javascript:", t3 = n3.contentWindow.document, t3.open(), t3.write("<script>document.F=Object<\/script" + o2), t3.close(), f2 = t3.F; e2--; ) delete f2[s][i[e2]];
+          return f2();
         };
         t2.exports = Object.create || function(t3, n3) {
           var r2;
-          return null !== t3 ? (u[s] = e(t3), r2 = new u(), u[s] = null, r2[c] = t3) : r2 = f(), void 0 === n3 ? r2 : o(r2, n3);
+          return null !== t3 ? (u[s] = e(t3), r2 = new u(), u[s] = null, r2[c] = t3) : r2 = f2(), void 0 === n3 ? r2 : o(r2, n3);
         };
       }, function(t2, n2, r) {
         var e = r(12), o = r(3), i = r(54);
@@ -955,10 +955,10 @@ function requireDist() {
           return t3;
         };
       }, function(t2, n2, r) {
-        var e = r(55), o = r(17), i = r(13), c = r(32), u = r(8), s = r(26), f = Object.getOwnPropertyDescriptor;
-        n2.f = r(4) ? f : function(t3, n3) {
+        var e = r(55), o = r(17), i = r(13), c = r(32), u = r(8), s = r(26), f2 = Object.getOwnPropertyDescriptor;
+        n2.f = r(4) ? f2 : function(t3, n3) {
           if (t3 = i(t3), n3 = c(n3, true), s) try {
-            return f(t3, n3);
+            return f2(t3, n3);
           } catch (t4) {
           }
           if (u(t3, n3)) return o(!e.f.call(t3, n3), t3[n3]);
@@ -971,10 +971,10 @@ function requireDist() {
       }, function(t2, n2, r) {
         var e = r(8), o = r(13), i = r(39)(false), c = r(19)("IE_PROTO");
         t2.exports = function(t3, n3) {
-          var r2, u = o(t3), s = 0, f = [];
-          for (r2 in u) r2 != c && e(u, r2) && f.push(r2);
-          for (; n3.length > s; ) e(u, r2 = n3[s++]) && (~i(f, r2) || f.push(r2));
-          return f;
+          var r2, u = o(t3), s = 0, f2 = [];
+          for (r2 in u) r2 != c && e(u, r2) && f2.push(r2);
+          for (; n3.length > s; ) e(u, r2 = n3[s++]) && (~i(f2, r2) || f2.push(r2));
+          return f2;
         };
       }, function(t2, n2, r) {
         var e = r(53), o = r(22);
@@ -1023,8 +1023,8 @@ function requireDist() {
         var e = r(20), o = r(15);
         t2.exports = function(t3) {
           return function(n3, r2) {
-            var i, c, u = String(o(n3)), s = e(r2), f = u.length;
-            return s < 0 || s >= f ? t3 ? "" : void 0 : (i = u.charCodeAt(s), i < 55296 || i > 56319 || s + 1 === f || (c = u.charCodeAt(s + 1)) < 56320 || c > 57343 ? t3 ? u.charAt(s) : i : t3 ? u.slice(s, s + 2) : (i - 55296 << 10) + (c - 56320) + 65536);
+            var i, c, u = String(o(n3)), s = e(r2), f2 = u.length;
+            return s < 0 || s >= f2 ? t3 ? "" : void 0 : (i = u.charCodeAt(s), i < 55296 || i > 56319 || s + 1 === f2 || (c = u.charCodeAt(s + 1)) < 56320 || c > 57343 ? t3 ? u.charAt(s) : i : t3 ? u.slice(s, s + 2) : (i - 55296 << 10) + (c - 56320) + 65536);
           };
         };
       }, function(t2, n2, r) {
@@ -1052,7 +1052,7 @@ function requireDist() {
         }, "values"), i.Arguments = i.Array, e("keys"), e("values"), e("entries");
       }, function(t2, n2) {
       }, function(t2, n2, r) {
-        var e, o, i, c = r(28), u = r(2), s = r(7), f = r(21), a = r(23), p = r(9), l = (r(3), r(14)), v = r(38), h = r(40), d = (r(58).set, r(60)), y = r(30).set, _ = r(48)(), x = "Promise", m = u.TypeError, w = u.process, g = u[x], w = u.process, b = "process" == f(w), O = function() {
+        var e, o, i, c = r(28), u = r(2), s = r(7), f2 = r(21), a = r(23), p = r(9), l = (r(3), r(14)), v = r(38), h = r(40), d = (r(58).set, r(60)), y = r(30).set, _ = r(48)(), x = "Promise", m = u.TypeError, w = u.process, g = u[x], w = u.process, b = "process" == f2(w), O = function() {
         }, j = !!(function() {
           try {
             var t3 = g.resolve(1), n3 = (t3.constructor = {})[r(1)("species")] = function(t4) {
@@ -1086,9 +1086,9 @@ function requireDist() {
             var r2 = t3._c;
             _(function() {
               for (var e2 = t3._v, o2 = 1 == t3._s, i2 = 0, c2 = function(n4) {
-                var r3, i3, c3 = o2 ? n4.ok : n4.fail, u2 = n4.resolve, s2 = n4.reject, f2 = n4.domain;
+                var r3, i3, c3 = o2 ? n4.ok : n4.fail, u2 = n4.resolve, s2 = n4.reject, f3 = n4.domain;
                 try {
-                  c3 ? (o2 || (2 == t3._h && I(t3), t3._h = 1), c3 === true ? r3 = e2 : (f2 && f2.enter(), r3 = c3(e2), f2 && f2.exit()), r3 === n4.promise ? s2(m("Promise-chain cycle")) : (i3 = E(r3)) ? i3.call(r3, u2, s2) : u2(r3)) : s2(e2);
+                  c3 ? (o2 || (2 == t3._h && I(t3), t3._h = 1), c3 === true ? r3 = e2 : (f3 && f3.enter(), r3 = c3(e2), f3 && f3.exit()), r3 === n4.promise ? s2(m("Promise-chain cycle")) : (i3 = E(r3)) ? i3.call(r3, u2, s2) : u2(r3)) : s2(e2);
                 } catch (t4) {
                   s2(t4);
                 }
@@ -1190,8 +1190,8 @@ function requireDist() {
       }, function(t2, n2, r) {
         r(65);
         for (var e = r(2), o = r(5), i = r(10), c = r(1)("toStringTag"), u = ["NodeList", "DOMTokenList", "MediaList", "StyleSheetList", "CSSRuleList"], s = 0; s < 5; s++) {
-          var f = u[s], a = e[f], p = a && a.prototype;
-          p && !p[c] && o(p, c, f), i[f] = i.Array;
+          var f2 = u[s], a = e[f2], p = a && a.prototype;
+          p && !p[c] && o(p, c, f2), i[f2] = i.Array;
         }
       }, function(t2, n2) {
         t2.exports = require$$0__default.default;
@@ -1203,9 +1203,9 @@ function requireDist() {
   return dist$1.exports;
 }
 requireDist();
-var map$1;
+var map$2;
 try {
-  map$1 = Map;
+  map$2 = Map;
 } catch (_) {
 }
 var set$1;
@@ -1229,7 +1229,7 @@ function baseClone(src, circulars, clones) {
   if (Array.isArray(src)) {
     return src.map(clone$1);
   }
-  if (map$1 && src instanceof map$1) {
+  if (map$2 && src instanceof map$2) {
     return new Map(Array.from(src.entries()));
   }
   if (set$1 && src instanceof set$1) {
@@ -3779,7 +3779,7 @@ function pipe$1(...fns) {
     return res;
   };
 }
-fp.curry(pMap);
+const map$1 = fp.curry(pMap);
 const visitor$4 = ({ key, attribute }, { remove }) => {
   if (attribute?.type === "password") {
     remove(key);
@@ -18430,6 +18430,19 @@ function asBoolean(value) {
   const normalized = value.toLowerCase().trim();
   return normalized !== "false" && normalized !== "0";
 }
+const version = "1.15.0-rc.1";
+const name = "@fourlights/strapi-plugin-deep-populate";
+const f = (msg, context = void 0) => {
+  const prefix = `[${name}] `;
+  const suffix = context !== void 0 ? `
+${prefix}${context}` : "";
+  return `${prefix}${msg}${suffix}`;
+};
+const error = (msg, context = void 0) => strapi.log.error(f(msg, context));
+const warn = (msg, context = void 0) => strapi.log.warn(f(msg, context));
+const info = (msg, context = void 0) => strapi.log.info(f(msg, context));
+const debug = (msg, context = void 0) => strapi.log.debug(f(msg, context));
+const log = { error, warn, info, debug };
 const populateIsWildcardEquivalent = async ({
   strapi: strapi2,
   schema: schema2,
@@ -18445,9 +18458,35 @@ const populateIsWildcardEquivalent = async ({
   );
   return populate2 === "*" || populate2 === true || JSON.stringify(expandedWildcardQuery) === JSON.stringify(populate2);
 };
+async function clearCacheForChangedSchemas(schemas) {
+  await map$1(schemas, async (schema2) => {
+    const deleted = await strapi.db.query("plugin::deep-populate.cache").deleteMany({
+      where: {
+        dependencies: { $contains: schema2 }
+      }
+    });
+    log.debug(`Deleted ${deleted.count} cached entries due to out of date schema '${schema2}'`);
+  });
+}
 const register = async ({ strapi: strapi2 }) => {
+  strapi2.hook("strapi::content-types.beforeSync").register(async () => {
+    const databaseSchema = await strapi2.db.dialect.schemaInspector.getSchema();
+    const storedSchema = await strapi2.db.schema.schemaStorage.read();
+    const { status, diff } = await strapi2.db.schema.schemaDiff.diff({
+      previousSchema: storedSchema?.schema,
+      databaseSchema,
+      userSchema: strapi2.db.schema.schema
+    });
+    if (status === "CHANGED") {
+      const updatedTables = (diff.tables.updated ?? []).map((t) => t.name);
+      const updatedSchemas = [...strapi2.db.metadata.values()].filter((m) => updatedTables.includes(m.tableName)).map((m) => m.uid);
+      const tableName = strapi2.db.metadata.get("plugin::deep-populate.cache").tableName;
+      const hasTable = await strapi2.db.connection.schema.hasTable(tableName);
+      if (hasTable) await clearCacheForChangedSchemas(updatedSchemas);
+    }
+  });
   strapi2.hook("strapi::content-types.afterSync").register(async () => {
-    const tableName = "populate_cache";
+    const tableName = strapi2.db.metadata.get("plugin::deep-populate.cache").tableName;
     const columnName = "dependencies";
     const hasIndex = await hasDeepPopulateCacheFullTextIndex(strapi2.db, tableName, columnName);
     const hasTable = await strapi2.db.connection.schema.hasTable(tableName);
@@ -18522,13 +18561,23 @@ const register = async ({ strapi: strapi2 }) => {
     return result;
   });
 };
-const version = "1.14.0";
-const name = "@fourlights/strapi-plugin-deep-populate";
-const error = (msg, context = void 0) => strapi.log.error(`[${name}] ${msg}`, context);
-const warn = (msg, context = void 0) => strapi.log.warn(`[${name}] ${msg}`, context);
-const info = (msg, context = void 0) => strapi.log.info(`[${name}] ${msg}`, context);
-const debug = (msg, context = void 0) => strapi.log.debug(`[${name}] ${msg}`, context);
-const log = { error, warn, info, debug };
+const UniqueConstraintErrorCodes = {
+  // PostgreSQL
+  POSTGRES_UNIQUE_VIOLATION: "23505",
+  // MySQL
+  MYSQL_DUPLICATE_ENTRY: 1062,
+  // SQLite
+  SQLITE_CONSTRAINT: 19,
+  SQLITE_CONSTRAINT_UNIQUE: 2067,
+  // SQL Server
+  SQLSERVER_DUPLICATE_KEY: 2601,
+  SQLSERVER_UNIQUE_KEY_VIOLATION: 2627
+};
+const isUniqueConstraintError = (error2) => {
+  const err = error2;
+  return Object.keys(UniqueConstraintErrorCodes).includes(err.code) || err.code === UniqueConstraintErrorCodes.POSTGRES_UNIQUE_VIOLATION || err.errno === UniqueConstraintErrorCodes.MYSQL_DUPLICATE_ENTRY || err.errno === UniqueConstraintErrorCodes.SQLITE_CONSTRAINT || err.errno === UniqueConstraintErrorCodes.SQLITE_CONSTRAINT_UNIQUE || err.number === UniqueConstraintErrorCodes.SQLSERVER_DUPLICATE_KEY || err.number === UniqueConstraintErrorCodes.SQLSERVER_UNIQUE_KEY_VIOLATION;
+};
+const majorMinorVersion = version.split(".").slice(0, -1).join(".");
 const sanitizeObject = (obj) => {
   if (obj === null || typeof obj !== "object") return obj;
   const dangerousProps = ["__proto__", "constructor", "prototype"];
@@ -18584,7 +18633,6 @@ const getConfig = (params) => {
   const localizations = params.localizations ?? contentTypeConfig.localizations ?? localizationsFallback;
   return { allow, deny, omitEmpty, localizations };
 };
-const majorMinorVersion = version.split(".").slice(0, -1).join(".");
 const isEqualConfig = (lhs, rhs) => {
   const cleanedLhs = JSON.parse(JSON.stringify(lhs));
   const cleanedRhs = JSON.parse(JSON.stringify(rhs));
@@ -18609,15 +18657,19 @@ const cache = ({ strapi: strapi2 }) => ({
   async set({ populate: populate2, dependencies, ...params }) {
     const documentService = strapi2.documents("plugin::deep-populate.cache");
     const hash = getHash(params);
-    const entry = await documentService.findFirst({ filters: { hash: { $eq: hash } } });
     try {
-      return entry ? await documentService.update({
-        documentId: entry.documentId,
-        data: { populate: populate2, dependencies: dependencies.join(",") }
-      }) : await documentService.create({ data: { hash, params, populate: populate2, dependencies: dependencies.join(",") } });
+      return await documentService.create({ data: { hash, params, populate: populate2, dependencies: dependencies.join(",") } });
     } catch (error2) {
-      log.error("[Plugin: Deep Populate] Failed to save cached entry", { error: error2 });
-      return;
+      if (isUniqueConstraintError(error2)) {
+        const entry = await documentService.findFirst({ filters: { hash: { $eq: hash } } });
+        if (entry) {
+          return await documentService.update({
+            documentId: entry.documentId,
+            data: { populate: populate2, dependencies: dependencies.join(",") }
+          });
+        }
+      }
+      log.error("Failed to save cached entry", error2);
     }
   },
   async clear(params) {
@@ -18784,6 +18836,7 @@ async function _populate({
   populate: populate2 = {},
   lookup = [],
   resolvedRelations,
+  resolvedSchemas,
   omitEmpty,
   __deny,
   __allow,
@@ -18799,6 +18852,7 @@ async function _populate({
   let relations = getRelations(model);
   let currentPopulate = cloneDeep__default.default(populate2);
   resolvedRelations.set(params.documentId, true);
+  resolvedSchemas.add(schema2);
   for (const [attrName, attr] of relations) {
     if (lookup.length > 0) {
       const parent = get__default.default(currentPopulate, lookup);
@@ -18870,6 +18924,7 @@ async function _populate({
         lookup,
         attrName,
         resolvedRelations,
+        resolvedSchemas,
         omitEmpty,
         __deny,
         __allow,
@@ -18881,6 +18936,7 @@ async function _populate({
         contentType: attr.target,
         relation: value,
         resolvedRelations,
+        resolvedSchemas,
         omitEmpty,
         locale: params.locale,
         status: params.status,
@@ -18896,6 +18952,7 @@ async function _populate({
         lookup,
         attrName,
         resolvedRelations,
+        resolvedSchemas,
         omitEmpty,
         __deny,
         __allow,
@@ -18911,9 +18968,11 @@ async function _populate({
 async function populate$1(params) {
   const config2 = getConfig(params);
   const resolvedRelations = /* @__PURE__ */ new Map();
+  const resolvedSchemas = /* @__PURE__ */ new Set();
   const populated = await _populate({
     schema: params.contentType,
     resolvedRelations,
+    resolvedSchemas,
     omitEmpty: config2.omitEmpty,
     localizations: config2.localizations,
     __deny: config2.deny,
@@ -18922,7 +18981,11 @@ async function populate$1(params) {
   });
   populated.__deepPopulated = true;
   populated.__deepPopulateConfig = config2;
-  const dependencies = [...resolvedRelations.keys()].filter((r) => !r.startsWith("api::"));
+  const dependencies = [
+    ...[...resolvedRelations.keys()].filter((r) => !r.startsWith("api::")),
+    // Remove content-types from resolved relations
+    ...resolvedSchemas.values()
+  ];
   return { populate: populated, dependencies };
 }
 const populate = ({ strapi: strapi2 }) => ({

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$2, 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, 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 require$$1 from "crypto";
 import require$$0$1 from "child_process";
 import has from "lodash/has";
@@ -604,9 +604,9 @@ function requireDist() {
         t2.exports = "constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",");
       }, function(t2, n2, r) {
         var e = r(2), o = r(6), i = r(7), c = r(5), u = "prototype", s = function(t3, n3, r2) {
-          var f, a, p, l = t3 & s.F, v = t3 & s.G, h = t3 & s.S, d = t3 & s.P, y = t3 & s.B, _ = t3 & s.W, x = v ? o : o[n3] || (o[n3] = {}), m = x[u], w = v ? e : h ? e[n3] : (e[n3] || {})[u];
+          var f2, a, p, l = t3 & s.F, v = t3 & s.G, h = t3 & s.S, d = t3 & s.P, y = t3 & s.B, _ = t3 & s.W, x = v ? o : o[n3] || (o[n3] = {}), m = x[u], w = v ? e : h ? e[n3] : (e[n3] || {})[u];
           v && (r2 = n3);
-          for (f in r2) a = !l && w && void 0 !== w[f], a && f in x || (p = a ? w[f] : r2[f], x[f] = v && "function" != typeof w[f] ? r2[f] : y && a ? i(p, e) : _ && w[f] == p ? (function(t4) {
+          for (f2 in r2) a = !l && w && void 0 !== w[f2], a && f2 in x || (p = a ? w[f2] : r2[f2], x[f2] = v && "function" != typeof w[f2] ? r2[f2] : y && a ? i(p, e) : _ && w[f2] == p ? (function(t4) {
             var n4 = function(n5, r3, e2) {
               if (this instanceof t4) {
                 switch (arguments.length) {
@@ -622,7 +622,7 @@ function requireDist() {
               return t4.apply(this, arguments);
             };
             return n4[u] = t4[u], n4;
-          })(p) : d && "function" == typeof p ? i(Function.call, p) : p, d && ((x.virtual || (x.virtual = {}))[f] = p, t3 & s.R && m && !m[f] && c(m, f, p)));
+          })(p) : d && "function" == typeof p ? i(Function.call, p) : p, d && ((x.virtual || (x.virtual = {}))[f2] = p, t3 & s.R && m && !m[f2] && c(m, f2, p)));
         };
         s.F = 1, s.G = 2, s.S = 4, s.P = 8, s.B = 16, s.W = 32, s.U = 64, s.R = 128, t2.exports = s;
       }, function(t2, n2) {
@@ -642,11 +642,11 @@ function requireDist() {
           } }).a;
         });
       }, function(t2, n2, r) {
-        var e = r(28), o = r(23), i = r(57), c = r(5), u = r(8), s = r(10), f = r(45), a = r(18), p = r(52), l = r(1)("iterator"), v = !([].keys && "next" in [].keys()), h = "@@iterator", d = "keys", y = "values", _ = function() {
+        var e = r(28), o = r(23), i = r(57), c = r(5), u = r(8), s = r(10), f2 = r(45), a = r(18), p = r(52), l = r(1)("iterator"), v = !([].keys && "next" in [].keys()), h = "@@iterator", d = "keys", y = "values", _ = function() {
           return this;
         };
         t2.exports = function(t3, n3, r2, x, m, w, g) {
-          f(r2, n3, x);
+          f2(r2, n3, x);
           var b, O, j, S = function(t4) {
             if (!v && t4 in T) return T[t4];
             switch (t4) {
@@ -677,7 +677,7 @@ function requireDist() {
           return i[t3] || (i[t3] = {});
         };
       }, function(t2, n2, r) {
-        var e, o, i, c = r(7), u = r(41), s = r(25), f = r(16), a = r(2), p = a.process, l = a.setImmediate, v = a.clearImmediate, h = a.MessageChannel, d = 0, y = {}, _ = "onreadystatechange", x = function() {
+        var e, o, i, c = r(7), u = r(41), s = r(25), f2 = r(16), a = r(2), p = a.process, l = a.setImmediate, v = a.clearImmediate, h = a.MessageChannel, d = 0, y = {}, _ = "onreadystatechange", x = function() {
           var t3 = +this;
           if (y.hasOwnProperty(t3)) {
             var n3 = y[t3];
@@ -697,8 +697,8 @@ function requireDist() {
           p.nextTick(c(x, t3, 1));
         } : h ? (o = new h(), i = o.port2, o.port1.onmessage = m, e = c(i.postMessage, i, 1)) : a.addEventListener && "function" == typeof postMessage && !a.importScripts ? (e = function(t3) {
           a.postMessage(t3 + "", "*");
-        }, a.addEventListener("message", m, false)) : e = _ in f("script") ? function(t3) {
-          s.appendChild(f("script"))[_] = function() {
+        }, a.addEventListener("message", m, false)) : e = _ in f2("script") ? function(t3) {
+          s.appendChild(f2("script"))[_] = function() {
             s.removeChild(this), x.call(t3);
           };
         } : function(t3) {
@@ -762,7 +762,7 @@ function requireDist() {
           });
         }
         Object.defineProperty(n2, "__esModule", { value: true });
-        var f = r(35), a = e(f);
+        var f2 = r(35), a = e(f2);
         n2.machineIdSync = u, n2.machineId = s;
         var p = r(70), l = r(71), v = process, h = v.platform, d = { native: "%windir%\\System32", mixed: "%windir%\\sysnative\\cmd.exe /c %windir%\\System32" }, y = { darwin: "ioreg -rd1 -c IOPlatformExpertDevice", win32: d[o()] + "\\REG.exe QUERY HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography /v MachineGuid", linux: "( cat /var/lib/dbus/machine-id /etc/machine-id 2> /dev/null || hostname ) | head -n 1 || :", freebsd: "kenv -q smbios.system.uuid || sysctl -n kern.hostuuid" };
       }, function(t2, n2, r) {
@@ -781,24 +781,24 @@ function requireDist() {
         var e = r(13), o = r(31), i = r(62);
         t2.exports = function(t3) {
           return function(n3, r2, c) {
-            var u, s = e(n3), f = o(s.length), a = i(c, f);
+            var u, s = e(n3), f2 = o(s.length), a = i(c, f2);
             if (t3 && r2 != r2) {
-              for (; f > a; ) if (u = s[a++], u != u) return true;
-            } else for (; f > a; a++) if ((t3 || a in s) && s[a] === r2) return t3 || a || 0;
+              for (; f2 > a; ) if (u = s[a++], u != u) return true;
+            } else for (; f2 > a; a++) if ((t3 || a in s) && s[a] === r2) return t3 || a || 0;
             return !t3 && -1;
           };
         };
       }, function(t2, n2, r) {
-        var e = r(7), o = r(44), i = r(43), c = r(3), u = r(31), s = r(64), f = {}, a = {}, n2 = t2.exports = function(t3, n3, r2, p, l) {
+        var e = r(7), o = r(44), i = r(43), c = r(3), u = r(31), s = r(64), f2 = {}, a = {}, n2 = t2.exports = function(t3, n3, r2, p, l) {
           var v, h, d, y, _ = l ? function() {
             return t3;
           } : s(t3), x = e(r2, p, n3 ? 2 : 1), m = 0;
           if ("function" != typeof _) throw TypeError(t3 + " is not iterable!");
           if (i(_)) {
-            for (v = u(t3.length); v > m; m++) if (y = n3 ? x(c(h = t3[m])[0], h[1]) : x(t3[m]), y === f || y === a) return y;
-          } else for (d = _.call(t3); !(h = d.next()).done; ) if (y = o(d, x, h.value, n3), y === f || y === a) return y;
+            for (v = u(t3.length); v > m; m++) if (y = n3 ? x(c(h = t3[m])[0], h[1]) : x(t3[m]), y === f2 || y === a) return y;
+          } else for (d = _.call(t3); !(h = d.next()).done; ) if (y = o(d, x, h.value, n3), y === f2 || y === a) return y;
         };
-        n2.BREAK = f, n2.RETURN = a;
+        n2.BREAK = f2, n2.RETURN = a;
       }, function(t2, n2) {
         t2.exports = function(t3, n3, r) {
           var e = void 0 === r;
@@ -875,7 +875,7 @@ function requireDist() {
       }, function(t2, n2, r) {
         var e = r(2), o = r(30).set, i = e.MutationObserver || e.WebKitMutationObserver, c = e.process, u = e.Promise, s = "process" == r(11)(c);
         t2.exports = function() {
-          var t3, n3, r2, f = function() {
+          var t3, n3, r2, f2 = function() {
             var e2, o2;
             for (s && (e2 = c.domain) && e2.exit(); t3; ) {
               o2 = t3.fn, t3 = t3.next;
@@ -888,20 +888,20 @@ function requireDist() {
             n3 = void 0, e2 && e2.enter();
           };
           if (s) r2 = function() {
-            c.nextTick(f);
+            c.nextTick(f2);
           };
           else if (i) {
             var a = true, p = document.createTextNode("");
-            new i(f).observe(p, { characterData: true }), r2 = function() {
+            new i(f2).observe(p, { characterData: true }), r2 = function() {
               p.data = a = !a;
             };
           } else if (u && u.resolve) {
             var l = u.resolve();
             r2 = function() {
-              l.then(f);
+              l.then(f2);
             };
           } else r2 = function() {
-            o.call(e, f);
+            o.call(e, f2);
           };
           return function(e2) {
             var o2 = { fn: e2, next: void 0 };
@@ -910,14 +910,14 @@ function requireDist() {
         };
       }, function(t2, n2, r) {
         var e = r(3), o = r(50), i = r(22), c = r(19)("IE_PROTO"), u = function() {
-        }, s = "prototype", f = function() {
+        }, s = "prototype", f2 = function() {
           var t3, n3 = r(16)("iframe"), e2 = i.length, o2 = ">";
-          for (n3.style.display = "none", r(25).appendChild(n3), n3.src = "javascript:", t3 = n3.contentWindow.document, t3.open(), t3.write("<script>document.F=Object<\/script" + o2), t3.close(), f = t3.F; e2--; ) delete f[s][i[e2]];
-          return f();
+          for (n3.style.display = "none", r(25).appendChild(n3), n3.src = "javascript:", t3 = n3.contentWindow.document, t3.open(), t3.write("<script>document.F=Object<\/script" + o2), t3.close(), f2 = t3.F; e2--; ) delete f2[s][i[e2]];
+          return f2();
         };
         t2.exports = Object.create || function(t3, n3) {
           var r2;
-          return null !== t3 ? (u[s] = e(t3), r2 = new u(), u[s] = null, r2[c] = t3) : r2 = f(), void 0 === n3 ? r2 : o(r2, n3);
+          return null !== t3 ? (u[s] = e(t3), r2 = new u(), u[s] = null, r2[c] = t3) : r2 = f2(), void 0 === n3 ? r2 : o(r2, n3);
         };
       }, function(t2, n2, r) {
         var e = r(12), o = r(3), i = r(54);
@@ -927,10 +927,10 @@ function requireDist() {
           return t3;
         };
       }, function(t2, n2, r) {
-        var e = r(55), o = r(17), i = r(13), c = r(32), u = r(8), s = r(26), f = Object.getOwnPropertyDescriptor;
-        n2.f = r(4) ? f : function(t3, n3) {
+        var e = r(55), o = r(17), i = r(13), c = r(32), u = r(8), s = r(26), f2 = Object.getOwnPropertyDescriptor;
+        n2.f = r(4) ? f2 : function(t3, n3) {
           if (t3 = i(t3), n3 = c(n3, true), s) try {
-            return f(t3, n3);
+            return f2(t3, n3);
           } catch (t4) {
           }
           if (u(t3, n3)) return o(!e.f.call(t3, n3), t3[n3]);
@@ -943,10 +943,10 @@ function requireDist() {
       }, function(t2, n2, r) {
         var e = r(8), o = r(13), i = r(39)(false), c = r(19)("IE_PROTO");
         t2.exports = function(t3, n3) {
-          var r2, u = o(t3), s = 0, f = [];
-          for (r2 in u) r2 != c && e(u, r2) && f.push(r2);
-          for (; n3.length > s; ) e(u, r2 = n3[s++]) && (~i(f, r2) || f.push(r2));
-          return f;
+          var r2, u = o(t3), s = 0, f2 = [];
+          for (r2 in u) r2 != c && e(u, r2) && f2.push(r2);
+          for (; n3.length > s; ) e(u, r2 = n3[s++]) && (~i(f2, r2) || f2.push(r2));
+          return f2;
         };
       }, function(t2, n2, r) {
         var e = r(53), o = r(22);
@@ -995,8 +995,8 @@ function requireDist() {
         var e = r(20), o = r(15);
         t2.exports = function(t3) {
           return function(n3, r2) {
-            var i, c, u = String(o(n3)), s = e(r2), f = u.length;
-            return s < 0 || s >= f ? t3 ? "" : void 0 : (i = u.charCodeAt(s), i < 55296 || i > 56319 || s + 1 === f || (c = u.charCodeAt(s + 1)) < 56320 || c > 57343 ? t3 ? u.charAt(s) : i : t3 ? u.slice(s, s + 2) : (i - 55296 << 10) + (c - 56320) + 65536);
+            var i, c, u = String(o(n3)), s = e(r2), f2 = u.length;
+            return s < 0 || s >= f2 ? t3 ? "" : void 0 : (i = u.charCodeAt(s), i < 55296 || i > 56319 || s + 1 === f2 || (c = u.charCodeAt(s + 1)) < 56320 || c > 57343 ? t3 ? u.charAt(s) : i : t3 ? u.slice(s, s + 2) : (i - 55296 << 10) + (c - 56320) + 65536);
           };
         };
       }, function(t2, n2, r) {
@@ -1024,7 +1024,7 @@ function requireDist() {
         }, "values"), i.Arguments = i.Array, e("keys"), e("values"), e("entries");
       }, function(t2, n2) {
       }, function(t2, n2, r) {
-        var e, o, i, c = r(28), u = r(2), s = r(7), f = r(21), a = r(23), p = r(9), l = (r(3), r(14)), v = r(38), h = r(40), d = (r(58).set, r(60)), y = r(30).set, _ = r(48)(), x = "Promise", m = u.TypeError, w = u.process, g = u[x], w = u.process, b = "process" == f(w), O = function() {
+        var e, o, i, c = r(28), u = r(2), s = r(7), f2 = r(21), a = r(23), p = r(9), l = (r(3), r(14)), v = r(38), h = r(40), d = (r(58).set, r(60)), y = r(30).set, _ = r(48)(), x = "Promise", m = u.TypeError, w = u.process, g = u[x], w = u.process, b = "process" == f2(w), O = function() {
         }, j = !!(function() {
           try {
             var t3 = g.resolve(1), n3 = (t3.constructor = {})[r(1)("species")] = function(t4) {
@@ -1058,9 +1058,9 @@ function requireDist() {
             var r2 = t3._c;
             _(function() {
               for (var e2 = t3._v, o2 = 1 == t3._s, i2 = 0, c2 = function(n4) {
-                var r3, i3, c3 = o2 ? n4.ok : n4.fail, u2 = n4.resolve, s2 = n4.reject, f2 = n4.domain;
+                var r3, i3, c3 = o2 ? n4.ok : n4.fail, u2 = n4.resolve, s2 = n4.reject, f3 = n4.domain;
                 try {
-                  c3 ? (o2 || (2 == t3._h && I(t3), t3._h = 1), c3 === true ? r3 = e2 : (f2 && f2.enter(), r3 = c3(e2), f2 && f2.exit()), r3 === n4.promise ? s2(m("Promise-chain cycle")) : (i3 = E(r3)) ? i3.call(r3, u2, s2) : u2(r3)) : s2(e2);
+                  c3 ? (o2 || (2 == t3._h && I(t3), t3._h = 1), c3 === true ? r3 = e2 : (f3 && f3.enter(), r3 = c3(e2), f3 && f3.exit()), r3 === n4.promise ? s2(m("Promise-chain cycle")) : (i3 = E(r3)) ? i3.call(r3, u2, s2) : u2(r3)) : s2(e2);
                 } catch (t4) {
                   s2(t4);
                 }
@@ -1162,8 +1162,8 @@ function requireDist() {
       }, function(t2, n2, r) {
         r(65);
         for (var e = r(2), o = r(5), i = r(10), c = r(1)("toStringTag"), u = ["NodeList", "DOMTokenList", "MediaList", "StyleSheetList", "CSSRuleList"], s = 0; s < 5; s++) {
-          var f = u[s], a = e[f], p = a && a.prototype;
-          p && !p[c] && o(p, c, f), i[f] = i.Array;
+          var f2 = u[s], a = e[f2], p = a && a.prototype;
+          p && !p[c] && o(p, c, f2), i[f2] = i.Array;
         }
       }, function(t2, n2) {
         t2.exports = require$$0$1;
@@ -1175,9 +1175,9 @@ function requireDist() {
   return dist$1.exports;
 }
 requireDist();
-var map$1;
+var map$2;
 try {
-  map$1 = Map;
+  map$2 = Map;
 } catch (_) {
 }
 var set$1;
@@ -1201,7 +1201,7 @@ function baseClone(src, circulars, clones) {
   if (Array.isArray(src)) {
     return src.map(clone$1);
   }
-  if (map$1 && src instanceof map$1) {
+  if (map$2 && src instanceof map$2) {
     return new Map(Array.from(src.entries()));
   }
   if (set$1 && src instanceof set$1) {
@@ -3751,7 +3751,7 @@ function pipe$1(...fns) {
     return res;
   };
 }
-curry(pMap);
+const map$1 = curry(pMap);
 const visitor$4 = ({ key, attribute }, { remove }) => {
   if (attribute?.type === "password") {
     remove(key);
@@ -4069,7 +4069,7 @@ const sort = traverseFactory().intercept(
     return Promise.all(sort2.map((nestedSort) => recurse(visitor2, options, nestedSort))).then((res) => res.filter((nestedSort) => !isEmpty$2(nestedSort)));
   }
 ).parse(isString, () => {
-  const tokenize = pipe$2(split("."), map$2(split(":")), flatten);
+  const tokenize = pipe$2(split("."), map$3(split(":")), flatten);
   const recompose = (parts) => {
     if (parts.length === 0) {
       return void 0;
@@ -18402,6 +18402,19 @@ function asBoolean(value) {
   const normalized = value.toLowerCase().trim();
   return normalized !== "false" && normalized !== "0";
 }
+const version = "1.15.0-rc.1";
+const name = "@fourlights/strapi-plugin-deep-populate";
+const f = (msg, context = void 0) => {
+  const prefix = `[${name}] `;
+  const suffix = context !== void 0 ? `
+${prefix}${context}` : "";
+  return `${prefix}${msg}${suffix}`;
+};
+const error = (msg, context = void 0) => strapi.log.error(f(msg, context));
+const warn = (msg, context = void 0) => strapi.log.warn(f(msg, context));
+const info = (msg, context = void 0) => strapi.log.info(f(msg, context));
+const debug = (msg, context = void 0) => strapi.log.debug(f(msg, context));
+const log = { error, warn, info, debug };
 const populateIsWildcardEquivalent = async ({
   strapi: strapi2,
   schema: schema2,
@@ -18417,9 +18430,35 @@ const populateIsWildcardEquivalent = async ({
   );
   return populate2 === "*" || populate2 === true || JSON.stringify(expandedWildcardQuery) === JSON.stringify(populate2);
 };
+async function clearCacheForChangedSchemas(schemas) {
+  await map$1(schemas, async (schema2) => {
+    const deleted = await strapi.db.query("plugin::deep-populate.cache").deleteMany({
+      where: {
+        dependencies: { $contains: schema2 }
+      }
+    });
+    log.debug(`Deleted ${deleted.count} cached entries due to out of date schema '${schema2}'`);
+  });
+}
 const register = async ({ strapi: strapi2 }) => {
+  strapi2.hook("strapi::content-types.beforeSync").register(async () => {
+    const databaseSchema = await strapi2.db.dialect.schemaInspector.getSchema();
+    const storedSchema = await strapi2.db.schema.schemaStorage.read();
+    const { status, diff } = await strapi2.db.schema.schemaDiff.diff({
+      previousSchema: storedSchema?.schema,
+      databaseSchema,
+      userSchema: strapi2.db.schema.schema
+    });
+    if (status === "CHANGED") {
+      const updatedTables = (diff.tables.updated ?? []).map((t) => t.name);
+      const updatedSchemas = [...strapi2.db.metadata.values()].filter((m) => updatedTables.includes(m.tableName)).map((m) => m.uid);
+      const tableName = strapi2.db.metadata.get("plugin::deep-populate.cache").tableName;
+      const hasTable = await strapi2.db.connection.schema.hasTable(tableName);
+      if (hasTable) await clearCacheForChangedSchemas(updatedSchemas);
+    }
+  });
   strapi2.hook("strapi::content-types.afterSync").register(async () => {
-    const tableName = "populate_cache";
+    const tableName = strapi2.db.metadata.get("plugin::deep-populate.cache").tableName;
     const columnName = "dependencies";
     const hasIndex = await hasDeepPopulateCacheFullTextIndex(strapi2.db, tableName, columnName);
     const hasTable = await strapi2.db.connection.schema.hasTable(tableName);
@@ -18494,13 +18533,23 @@ const register = async ({ strapi: strapi2 }) => {
     return result;
   });
 };
-const version = "1.14.0";
-const name = "@fourlights/strapi-plugin-deep-populate";
-const error = (msg, context = void 0) => strapi.log.error(`[${name}] ${msg}`, context);
-const warn = (msg, context = void 0) => strapi.log.warn(`[${name}] ${msg}`, context);
-const info = (msg, context = void 0) => strapi.log.info(`[${name}] ${msg}`, context);
-const debug = (msg, context = void 0) => strapi.log.debug(`[${name}] ${msg}`, context);
-const log = { error, warn, info, debug };
+const UniqueConstraintErrorCodes = {
+  // PostgreSQL
+  POSTGRES_UNIQUE_VIOLATION: "23505",
+  // MySQL
+  MYSQL_DUPLICATE_ENTRY: 1062,
+  // SQLite
+  SQLITE_CONSTRAINT: 19,
+  SQLITE_CONSTRAINT_UNIQUE: 2067,
+  // SQL Server
+  SQLSERVER_DUPLICATE_KEY: 2601,
+  SQLSERVER_UNIQUE_KEY_VIOLATION: 2627
+};
+const isUniqueConstraintError = (error2) => {
+  const err = error2;
+  return Object.keys(UniqueConstraintErrorCodes).includes(err.code) || err.code === UniqueConstraintErrorCodes.POSTGRES_UNIQUE_VIOLATION || err.errno === UniqueConstraintErrorCodes.MYSQL_DUPLICATE_ENTRY || err.errno === UniqueConstraintErrorCodes.SQLITE_CONSTRAINT || err.errno === UniqueConstraintErrorCodes.SQLITE_CONSTRAINT_UNIQUE || err.number === UniqueConstraintErrorCodes.SQLSERVER_DUPLICATE_KEY || err.number === UniqueConstraintErrorCodes.SQLSERVER_UNIQUE_KEY_VIOLATION;
+};
+const majorMinorVersion = version.split(".").slice(0, -1).join(".");
 const sanitizeObject = (obj) => {
   if (obj === null || typeof obj !== "object") return obj;
   const dangerousProps = ["__proto__", "constructor", "prototype"];
@@ -18556,7 +18605,6 @@ const getConfig = (params) => {
   const localizations = params.localizations ?? contentTypeConfig.localizations ?? localizationsFallback;
   return { allow, deny, omitEmpty, localizations };
 };
-const majorMinorVersion = version.split(".").slice(0, -1).join(".");
 const isEqualConfig = (lhs, rhs) => {
   const cleanedLhs = JSON.parse(JSON.stringify(lhs));
   const cleanedRhs = JSON.parse(JSON.stringify(rhs));
@@ -18581,15 +18629,19 @@ const cache = ({ strapi: strapi2 }) => ({
   async set({ populate: populate2, dependencies, ...params }) {
     const documentService = strapi2.documents("plugin::deep-populate.cache");
     const hash = getHash(params);
-    const entry = await documentService.findFirst({ filters: { hash: { $eq: hash } } });
     try {
-      return entry ? await documentService.update({
-        documentId: entry.documentId,
-        data: { populate: populate2, dependencies: dependencies.join(",") }
-      }) : await documentService.create({ data: { hash, params, populate: populate2, dependencies: dependencies.join(",") } });
+      return await documentService.create({ data: { hash, params, populate: populate2, dependencies: dependencies.join(",") } });
     } catch (error2) {
-      log.error("[Plugin: Deep Populate] Failed to save cached entry", { error: error2 });
-      return;
+      if (isUniqueConstraintError(error2)) {
+        const entry = await documentService.findFirst({ filters: { hash: { $eq: hash } } });
+        if (entry) {
+          return await documentService.update({
+            documentId: entry.documentId,
+            data: { populate: populate2, dependencies: dependencies.join(",") }
+          });
+        }
+      }
+      log.error("Failed to save cached entry", error2);
     }
   },
   async clear(params) {
@@ -18756,6 +18808,7 @@ async function _populate({
   populate: populate2 = {},
   lookup = [],
   resolvedRelations,
+  resolvedSchemas,
   omitEmpty,
   __deny,
   __allow,
@@ -18771,6 +18824,7 @@ async function _populate({
   let relations = getRelations(model);
   let currentPopulate = cloneDeep$1(populate2);
   resolvedRelations.set(params.documentId, true);
+  resolvedSchemas.add(schema2);
   for (const [attrName, attr] of relations) {
     if (lookup.length > 0) {
       const parent = get$2(currentPopulate, lookup);
@@ -18842,6 +18896,7 @@ async function _populate({
         lookup,
         attrName,
         resolvedRelations,
+        resolvedSchemas,
         omitEmpty,
         __deny,
         __allow,
@@ -18853,6 +18908,7 @@ async function _populate({
         contentType: attr.target,
         relation: value,
         resolvedRelations,
+        resolvedSchemas,
         omitEmpty,
         locale: params.locale,
         status: params.status,
@@ -18868,6 +18924,7 @@ async function _populate({
         lookup,
         attrName,
         resolvedRelations,
+        resolvedSchemas,
         omitEmpty,
         __deny,
         __allow,
@@ -18883,9 +18940,11 @@ async function _populate({
 async function populate$1(params) {
   const config2 = getConfig(params);
   const resolvedRelations = /* @__PURE__ */ new Map();
+  const resolvedSchemas = /* @__PURE__ */ new Set();
   const populated = await _populate({
     schema: params.contentType,
     resolvedRelations,
+    resolvedSchemas,
     omitEmpty: config2.omitEmpty,
     localizations: config2.localizations,
     __deny: config2.deny,
@@ -18894,7 +18953,11 @@ async function populate$1(params) {
   });
   populated.__deepPopulated = true;
   populated.__deepPopulateConfig = config2;
-  const dependencies = [...resolvedRelations.keys()].filter((r) => !r.startsWith("api::"));
+  const dependencies = [
+    ...[...resolvedRelations.keys()].filter((r) => !r.startsWith("api::")),
+    // Remove content-types from resolved relations
+    ...resolvedSchemas.values()
+  ];
   return { populate: populated, dependencies };
 }
 const populate = ({ strapi: strapi2 }) => ({

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

@@ -1,3 +1,5 @@
+import type { UID } from "@strapi/strapi";
+export declare function clearCacheForChangedSchemas(schemas: UID.Schema[]): Promise<void>;
 declare const _default: ({ strapi }: {
     strapi: any;
 }) => Promise<void>;

package/dist/server/src/utils/isUniqueConstraintError.d.ts

@@ -0,0 +1 @@
+export declare const isUniqueConstraintError: (error: unknown) => boolean;

package/dist/server/src/utils/log.d.ts

@@ -1,11 +1,11 @@
-export declare const error: (msg: any, context?: any) => import("winston").Logger;
-export declare const warn: (msg: any, context?: any) => import("winston").Logger;
-export declare const info: (msg: any, context?: any) => import("winston").Logger;
-export declare const debug: (msg: any, context?: any) => import("winston").Logger;
+export declare const error: (msg: string, context?: any) => import("winston").Logger;
+export declare const warn: (msg: string, context?: any) => import("winston").Logger;
+export declare const info: (msg: string, context?: any) => import("winston").Logger;
+export declare const debug: (msg: string, context?: any) => import("winston").Logger;
 declare const _default: {
-    error: (msg: any, context?: any) => import("winston").Logger;
-    warn: (msg: any, context?: any) => import("winston").Logger;
-    info: (msg: any, context?: any) => import("winston").Logger;
-    debug: (msg: any, context?: any) => import("winston").Logger;
+    error: (msg: string, context?: any) => import("winston").Logger;
+    warn: (msg: string, context?: any) => import("winston").Logger;
+    info: (msg: string, context?: any) => import("winston").Logger;
+    debug: (msg: string, context?: any) => import("winston").Logger;
 };
 export default _default;

package/dist/server/src/utils/version.d.ts

@@ -0,0 +1 @@
+export declare const majorMinorVersion: string;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.14.0",
+  "version": "1.15.0-rc.1",
   "keywords": [
     "strapi",
     "strapi-plugin",