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

package/dist/server/index.js

@@ -18430,7 +18430,7 @@ function asBoolean(value) {
   const normalized = value.toLowerCase().trim();
   return normalized !== "false" && normalized !== "0";
 }
-const version = "1.15.0-rc.0";
+const version = "1.15.0-rc.1";
 const name = "@fourlights/strapi-plugin-deep-populate";
 const f = (msg, context = void 0) => {
   const prefix = `[${name}] `;
@@ -18465,7 +18465,7 @@ async function clearCacheForChangedSchemas(schemas) {
         dependencies: { $contains: schema2 }
       }
     });
-    log.info(`Deleted ${deleted.count} cached entries due to out of date schema '${schema2}'`);
+    log.debug(`Deleted ${deleted.count} cached entries due to out of date schema '${schema2}'`);
   });
 }
 const register = async ({ strapi: strapi2 }) => {
@@ -18561,6 +18561,22 @@ const register = async ({ strapi: strapi2 }) => {
     return result;
   });
 };
+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;
@@ -18641,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) {
+      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);
-      return;
     }
   },
   async clear(params) {

package/dist/server/index.mjs

@@ -18402,7 +18402,7 @@ function asBoolean(value) {
   const normalized = value.toLowerCase().trim();
   return normalized !== "false" && normalized !== "0";
 }
-const version = "1.15.0-rc.0";
+const version = "1.15.0-rc.1";
 const name = "@fourlights/strapi-plugin-deep-populate";
 const f = (msg, context = void 0) => {
   const prefix = `[${name}] `;
@@ -18437,7 +18437,7 @@ async function clearCacheForChangedSchemas(schemas) {
         dependencies: { $contains: schema2 }
       }
     });
-    log.info(`Deleted ${deleted.count} cached entries due to out of date schema '${schema2}'`);
+    log.debug(`Deleted ${deleted.count} cached entries due to out of date schema '${schema2}'`);
   });
 }
 const register = async ({ strapi: strapi2 }) => {
@@ -18533,6 +18533,22 @@ const register = async ({ strapi: strapi2 }) => {
     return result;
   });
 };
+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;
@@ -18613,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) {
+      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);
-      return;
     }
   },
   async clear(params) {

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

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

package/package.json

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