strapi-content-sync-pro 1.0.1 → 1.0.3

package/server/src/utils/comparator.js

@@ -8,26 +8,33 @@
  * @param {Object} options
  * @param {string} options.direction        – "push" | "pull" | "both"
  * @param {string} options.conflictStrategy – "latest" | "local_wins" | "remote_wins"
- * @returns {{ toPush, toPull, toCreateRemote, toCreateLocal }}
+ * @param {boolean} options.syncDeletions   – propagate missing records as deletions
+ * @returns {{ toPush, toPull, toCreateRemote, toCreateLocal, toDeleteRemote, toDeleteLocal }}
  */
 function compareRecords(localRecords, remoteRecords, options = {}) {
-  const { direction = 'both', conflictStrategy = 'latest' } = options;
+  const { direction = 'both', conflictStrategy = 'latest', syncDeletions = false } = options;
 
   const result = {
     toPush: [],
     toPull: [],
     toCreateRemote: [],
     toCreateLocal: [],
+    toDeleteRemote: [],
+    toDeleteLocal: [],
   };
 
   const localBySyncId = new Map();
   const remoteBySyncId = new Map();
 
+  const keyOf = (r) => r && (r.documentId || r.syncId);
+
   for (const r of localRecords) {
-    if (r.syncId) localBySyncId.set(r.syncId, r);
+    const k = keyOf(r);
+    if (k) localBySyncId.set(k, r);
   }
   for (const r of remoteRecords) {
-    if (r.syncId) remoteBySyncId.set(r.syncId, r);
+    const k = keyOf(r);
+    if (k) remoteBySyncId.set(k, r);
   }
 
   // Records that exist on both sides
@@ -43,7 +50,11 @@ function compareRecords(localRecords, remoteRecords, options = {}) {
         result.toPull.push({ local: localRecord, remote: remoteRecord });
       }
     } else if (direction === 'push' || direction === 'both') {
-      result.toCreateRemote.push(localRecord);
+      if (syncDeletions && direction !== 'both') {
+        result.toDeleteRemote.push(localRecord);
+      } else {
+        result.toCreateRemote.push(localRecord);
+      }
     }
   }
 
@@ -51,7 +62,12 @@ function compareRecords(localRecords, remoteRecords, options = {}) {
   for (const [syncId] of remoteBySyncId) {
     if (!localBySyncId.has(syncId)) {
       if (direction === 'pull' || direction === 'both') {
-        result.toCreateLocal.push(remoteBySyncId.get(syncId));
+        const remoteRecord = remoteBySyncId.get(syncId);
+        if (syncDeletions && direction !== 'both') {
+          result.toDeleteLocal.push(remoteRecord);
+        } else {
+          result.toCreateLocal.push(remoteRecord);
+        }
       }
     }
   }

package/server/src/utils/fetcher.js

@@ -19,7 +19,7 @@ async function fetchLocalPage(strapi, uid, { fields, lastSyncAt, page = 1, pageS
   }
 
   if (fields && fields.length > 0) {
-    params.fields = [...new Set([...fields, 'syncId', 'updatedAt'])];
+    params.fields = [...new Set([...fields, 'documentId', 'syncId', 'updatedAt'])];
   }
 
   const records = (await strapi.documents(uid).findMany(params)) || [];
@@ -37,7 +37,7 @@ async function fetchRemotePage(remoteConfig, uid, { fields, lastSyncAt, page = 1
   const url = new URL(`/api/${pluralName}`, baseUrl);
 
   if (fields && fields.length > 0) {
-    const allFields = [...new Set([...fields, 'syncId', 'updatedAt'])];
+    const allFields = [...new Set([...fields, 'documentId', 'syncId', 'updatedAt'])];
     allFields.forEach((f, i) => {
       url.searchParams.set(`fields[${i}]`, f);
     });
@@ -123,10 +123,19 @@ async function fetchRemoteRecords(remoteConfig, uid, options = {}) {
  * e.g. "api::product.product" → "products"
  */
 function uidToPluralEndpoint(uid) {
+  const contentType = global.strapi?.contentTypes?.[uid];
+  const configuredPlural = contentType?.info?.pluralName;
+  if (configuredPlural) {
+    return configuredPlural;
+  }
+
   const parts = uid.split('.');
   const modelName = parts[parts.length - 1];
   if (modelName.endsWith('s')) return modelName;
   if (modelName.endsWith('y')) return modelName.slice(0, -1) + 'ies';
+  if (modelName.endsWith('ch') || modelName.endsWith('sh') || modelName.endsWith('x') || modelName.endsWith('z')) {
+    return modelName + 'es';
+  }
   return modelName + 's';
 }